Add more debug messages

Author: TheAMM

src/thumbnailer_server.lua

@@ -111,6 +111,7 @@ end
 
 
 function do_worker_job(state_json_string, frames_json_string)
+    msg.debug("Handling given job")
     local thumb_state, err = utils.parse_json(state_json_string)
     if err then
         msg.error("Failed to parse state JSON")
@@ -128,23 +129,28 @@ function do_worker_job(state_json_string, frames_json_string)
         if ExecutableFinder:get_executable_path("ffmpeg") then
             thumbnail_func = create_thumbnail_ffmpeg
         else
-            msg.warning("Could not find ffmpeg in PATH! Falling back on mpv.")
+            msg.warn("Could not find ffmpeg in PATH! Falling back on mpv.")
         end
     end
 
     local file_duration = mp.get_property_native("duration")
     local file_path = thumb_state.worker_input_path
 
     if thumb_state.is_remote then
+        if (thumbnail_func == create_thumbnail_ffmpeg) then
+            msg.warn("Thumbnailing remote path, falling back on mpv.")
+        end
         thumbnail_func = create_thumbnail_mpv
     end
 
     local generate_thumbnail_for_index = function(thumbnail_index)
         -- Given a 1-based thumbnail index, generate a thumbnail for it based on the thumbnailer state
+        local thumb_idx = thumbnail_index - 1
+        msg.debug("Starting work on thumbnail", thumb_idx)
 
-        local thumbnail_path = thumb_state.thumbnail_template:format(thumbnail_index-1)
+        local thumbnail_path = thumb_state.thumbnail_template:format(thumb_idx)
         -- Grab the "middle" of the thumbnail duration instead of the very start, and leave some margin in the end
-        local timestamp = math.min(file_duration - 0.25, (thumbnail_index - 1 + 0.5) * thumb_state.thumbnail_delta)
+        local timestamp = math.min(file_duration - 0.25, (thumb_idx + 0.5) * thumb_state.thumbnail_delta)
 
         mp.commandv("script-message", "mpv_thumbnail_script-progress", tostring(thumbnail_index))
 
@@ -161,7 +167,7 @@ function do_worker_job(state_json_string, frames_json_string)
             local existing_thumbnail_filesize = thumbnail_file:seek("end")
             if existing_thumbnail_filesize ~= thumbnail_raw_size then
                 -- Size doesn't match, so (re)generate
-                msg.warn("Thumbnail", thumbnail_index-1, "did not match expected size, regenerating")
+                msg.warn("Thumbnail", thumb_idx, "did not match expected size, regenerating")
                 need_thumbnail_generation = true
             end
             thumbnail_file:close()
@@ -173,12 +179,15 @@ function do_worker_job(state_json_string, frames_json_string)
 
             if success == nil then
                 -- Killed by us, changing files, ignore
+                msg.debug("Changing files, subprocess killed")
                 return true
             elseif not success then
-                -- Failure
+                -- Real failure
                 mp.osd_message("Thumbnailing failed, check console for details", 3.5)
                 return true
             end
+        else
+            msg.debug("Thumbnail", thumb_idx, "already done!")
         end
 
         -- Verify thumbnail size
@@ -207,19 +216,21 @@ function do_worker_job(state_json_string, frames_json_string)
             thumbnail_file:close()
         end
 
+        msg.debug("Finished work on thumbnail", thumb_idx)
         mp.commandv("script-message", "mpv_thumbnail_script-ready", tostring(thumbnail_index), thumbnail_path)
     end
 
-    for i, thumbnail_index in ipairs(thumbnail_indexes) do
-        local bail = generate_thumbnail_for_index(thumbnail_index)
-        if bail then return end
-    end
-
     msg.debug(("Generating %d thumbnails @ %dx%d for %q"):format(
         #thumbnail_indexes,
         thumb_state.thumbnail_size.w,
         thumb_state.thumbnail_size.h,
         file_path))
+
+    for i, thumbnail_index in ipairs(thumbnail_indexes) do
+        local bail = generate_thumbnail_for_index(thumbnail_index)
+        if bail then return end
+    end
+
 end
 
 -- Set up listeners and keybinds

src/thumbnailer_shared.lua

@@ -74,6 +74,8 @@ end
 
 
 function Thumbnailer:update_state()
+    msg.debug("Gathering video/thumbnail state")
+
     self.state.thumbnail_delta = self:get_delta()
     self.state.thumbnail_count = self:get_thumbnail_count(self.state.thumbnail_delta)
 
@@ -106,6 +108,8 @@ function Thumbnailer:update_state()
         self.state.available = true
     end
 
+    msg.debug("Thumbnailer.state:", utils.to_string(self.state))
+
 end
 
 
@@ -374,22 +378,25 @@ function Thumbnailer:start_worker_jobs()
         mp.osd_message(err, 3)
 
     else
+        msg.debug( ("Splitting %d thumbnails amongst %d worker(s)"):format(self.state.thumbnail_count, worker_count) )
+
         local frame_job_order = self:_create_thumbnail_job_order()
         local worker_jobs = {}
         for i = 1, worker_count do worker_jobs[worker_list[i]] = {} end
 
-        -- Split frames amongs the workers
+        -- Split frames amongst the workers
         for i, thumbnail_index in ipairs(frame_job_order) do
             local worker_id = worker_list[ ((i-1) % worker_count) + 1 ]
             table.insert(worker_jobs[worker_id], thumbnail_index)
         end
 
         local state_json_string = utils.format_json(self.state)
+        msg.debug("Giving workers state:", state_json_string)
 
         for worker_name, worker_frames in pairs(worker_jobs) do
             if #worker_frames > 0 then
                 local frames_json_string = utils.format_json(worker_frames)
-                msg.debug("Giving job to", worker_name, frames_json_string)
+                msg.debug("Assigning job to", worker_name, frames_json_string)
                 mp.commandv("script-message-to", worker_name, "mpv_thumbnail_script-job", state_json_string, frames_json_string)
             end
         end