README.md

@@ -63,20 +63,21 @@ This script requires the following software to be installed on the system
 - `clipboard_command - xclip -o`: The command to use to get the contents of the clipboard
 - `cursor_icon - ➤`: The icon to use for the cursor
 - `display_limit - 10`: The maximum amount of videos to show on the OSD at once
-- `download_directory - ~/videos/YouTube`: The directory to use when downloading a video
+- `download_directory - ~/videos/YouTube`: The directory to use when
+  downloading a video
 - `download_quality 720p`: The maximum download quality
 - `downloader - curl`: The name of the program to use to download the video
 - `font_name - JetBrains Mono`: The name of the font to use
 - `font_size - 12`: Size of the font
-- `marked_icon - ⇅`: The icon to use to mark a video as ready to be moved in the queue
+- `marked_icon - ⇅`: The icon to use to mark a video as ready to be moved in
+  the queue
 - `menu_timeout - 5`: The number of seconds until the menu times out
 - `show_errors - yes`: Show error messages on the OSD
 - `ytdlp_file_format - mp4`: The preferred file format for downloaded videos
-- `ytdlp_output_template - %(uploader)s/%(title)s.%(ext)s`: The [yt-dlp output template string](https://github.com/yt-dlp/yt-dlp#output-template)
+- `ytdlp_output_template - %(uploader)s/%(title)s.%(ext)s`: The [yt-dlp output
-  - Full path with the default `download_directory` is: `~/videos/YouTube/<uploader>/<title>.<ext>`
+  template string](https://github.com/yt-dlp/yt-dlp#output-template)
-- `use_history_db - no`: Enable watch history tracking through integration with [mpv-youtube-queue-server](https://gitea.suda.codes/sudacode/mpv-youtube-queue-server)
+  - Full path with the default `download_directory`
-- `backend_host`: ip or hostname of the backend server
+    is: `~/videos/YouTube/<uploader>/<title>.<ext>`
-- `backend_port`: port to connect to for the backend server
 
 ## License
 

mpv-youtube-queue.conf

@@ -26,6 +26,6 @@ menu_timeout=5
 show_errors=yes
 ytdlp_file_format=mp4
 ytdlp_output_template=%(uploader)s/%(title)s.%(ext)s
-use_history_db=no
+use_history_db=yes
 backend_host=http://localhost
 backend_port=42069

mpv-youtube-queue.lua

@@ -29,7 +29,6 @@ local marked_index = nil
 local current_video = nil
 local destroyer = nil
 local timeout
-local debug = true
 
 local options = {
     add_to_queue = "ctrl+a",
@@ -60,7 +59,7 @@ local options = {
     show_errors = true,
     ytdlp_file_format = "mp4",
     ytdlp_output_template = "%(uploader)s/%(title)s.%(ext)s",
-    use_history_db = false,
+    use_history_db = true,
     backend_host = "http://localhost",
     backend_port = "42069"
 }
@@ -106,18 +105,20 @@ local style = {
 -- }}}
 
 -- HELPERS {{{
-
 -- surround string with single quotes if it does not already have them
 local function surround_with_quotes(s)
-    if string.sub(s, 0, 1) == '"' and string.sub(s, -1) == '"' then
+    if string.sub(s, 0, 1) == "'" and string.sub(s, -1) == "'" then
-        return
+        return s
     else
-        return '"' .. s .. '"'
+        return "'" .. s .. "'"
     end
 end
 
 local function strip(s) return string.gsub(s, "['\n\r]", "") end
 
+-- run sleep shell command for n seconds
+local function sleep(n) os.execute("sleep " .. tonumber(n)) end
+
 local function print_osd_message(message, duration, s)
     if s == style.error and not options.show_errors then return end
     destroy()
@@ -130,11 +131,8 @@ end
 -- returns true if the provided path exists and is a file
 local function is_file(filepath)
     local result = utils.file_info(filepath)
-    if debug and type(result) == "table" then
+    if result == nil then return false end
-        print("IS_FILE() check: " .. tostring(result.is_file))
+    return result.is_file
-    end
-    if result == nil or type(result) ~= "table" then return false end
-    return true
 end
 
 -- returns the filename given a path (e.g. /home/user/file.txt -> file.txt)
@@ -212,7 +210,7 @@ local function _split_command(cmd)
 end
 
 function YouTubeQueue._add_to_history_db(v)
-    if not options.use_history_db then return false end
+    if not options.use_history_db then return end
     local url = options.backend_host .. ":" .. options.backend_port ..
         "/add_video"
     local command = {
@@ -226,7 +224,7 @@ function YouTubeQueue._add_to_history_db(v)
         playback_only = false,
         capture_stdout = true,
         args = command
-    }, function(success, _, err)
+    }, function(success, result, err)
         if not success then
             print_osd_message("Failed to send video data to backend: " .. err,
                 MSG_DURATION, style.error)
@@ -296,8 +294,8 @@ end
 function YouTubeQueue.print_current_video()
     destroy()
     local current = current_video
-    if current and current.vidro_url ~= "" and is_file(current.video_url) then
+    if current and current.vidro_url and is_file(current.video_url) then
-        print_osd_message("Playing: " .. current.video_url, 3)
+        print_osd_message("Playing: " .. current.video_name, 3)
     else
         if current and current.video_url then
             print_osd_message("Playing: " .. current.video_name .. ' by ' ..
@@ -340,19 +338,14 @@ function YouTubeQueue.is_in_queue(url)
 end
 
 -- Function to find the index of the currently playing video
-function YouTubeQueue.update_current_index(update_history)
+function YouTubeQueue.update_current_index()
-    if debug then print("Updating current index") end
     if #video_queue == 0 then return end
-    if update_history == nil then update_history = false end
     local current_url = mp.get_property("path")
     for i, v in ipairs(video_queue) do
         if v.video_url == current_url then
             index = i
             selected_index = index
             current_video = YouTubeQueue.get_video_at(index)
-            if update_history then
-                YouTubeQueue._add_to_history_db(current_video)
-            end
             return
         end
     end
@@ -492,7 +485,6 @@ function YouTubeQueue.play_video_at(idx)
     end
     index = idx
     selected_index = idx
-    current_video = video_queue[index]
     mp.set_property_number("playlist-pos", index - 1) -- zero-based index
     YouTubeQueue.print_current_video()
     return current_video
@@ -522,6 +514,7 @@ function YouTubeQueue.play_video(direction)
         mp.set_property_number("playlist-pos", index - 1)
     end
     YouTubeQueue.print_current_video()
+    -- YouTubeQueue._add_to_history_db(current_video)
 end
 
 -- add the video to the queue from the clipboard or call from script-message
@@ -542,9 +535,9 @@ function YouTubeQueue.add_to_queue(url, update_internal_playlist)
     end
 
     local video, channel_url, channel_name, video_name
-    url = strip(url)
     if not is_file(url) then
         channel_url, channel_name, video_name = YouTubeQueue.get_video_info(url)
+        url = strip(url)
         if (channel_url == nil or channel_name == nil or video_name == nil) or
             (channel_url == "" or channel_name == "" or video_name == "") then
             print_osd_message("Error getting video info.", MSG_DURATION,
@@ -646,30 +639,21 @@ end
 -- This function is called when the current file ends or when moving to the
 -- next or previous item in the internal playlist
 local function on_end_file(event)
-    if debug then print("End file event triggered: " .. event.reason) end
     if event.reason == "eof" then -- The file ended normally
-        YouTubeQueue.update_current_index(true)
+        YouTubeQueue.update_current_index()
     end
+    YouTubeQueue._add_to_history_db(current_video)
 end
 
 -- Function to be called when the track-changed event is triggered
-local function on_track_changed()
+local function on_track_changed() YouTubeQueue.update_current_index() end
-    if debug then print("Track changed event triggered.") end
-    YouTubeQueue.update_current_index()
-end
-
-local function on_file_loaded()
-    if debug then print("Load file event triggered.") end
-    YouTubeQueue.update_current_index(true)
-end
 
 -- Function to be called when the playback-restart event is triggered
 local function on_playback_restart()
-    if debug then print("Playback restart event triggered.") end
     local playlist_size = mp.get_property_number("playlist-count", 0)
-    -- if current_video ~= nil and playlist_size > 1 then
+    if current_video ~= nil and playlist_size > 1 then
-    -- YouTubeQueue.update_current_index()
+        YouTubeQueue.update_current_index()
-    if current_video == nil then
+    elseif current_video == nil then
         local url = mp.get_property("path")
         YouTubeQueue.add_to_queue(url)
         YouTubeQueue._add_to_history_db(current_video)
@@ -712,7 +696,6 @@ mp.add_key_binding(options.remove_from_queue, "delete_video",
 mp.register_event("end-file", on_end_file)
 mp.register_event("track-changed", on_track_changed)
 mp.register_event("playback-restart", on_playback_restart)
-mp.register_event("file-loaded", on_file_loaded)
 
 -- keep for backwards compatibility
 mp.register_script_message("add_to_queue", YouTubeQueue.add_to_queue)