Display in-progress thumbnails in progress display

Author: TheAMM

src/patched_osc.lua

@@ -158,12 +158,26 @@ function display_thumbnail(pos, value, ass)
 
             -- Draw the generation progress
             local block_w = (thumb_size.w / thumbs_total) * msy
+
+            -- Draw finished thumbnail blocks (white)
             ass:new_event()
             ass:pos(bg_left, framegraph_top)
             ass:append(("{\\bord0\\1c&HFFFFFF&\\1a&H%X&"):format(0))
             ass:draw_start(2)
-            for i in pairs(Thumbnailer.state.thumbnails) do
-                if i ~= closest_index then
+            for i, v in pairs(Thumbnailer.state.thumbnails) do
+                if i ~= closest_index and v then
+                    ass:rect_cw(i*block_w, 0, (i+1)*block_w, framegraph_h)
+                end
+            end
+            ass:draw_stop()
+
+            -- Draw in-progress thumbnail blocks (grayish green)
+            ass:new_event()
+            ass:pos(bg_left, framegraph_top)
+            ass:append(("{\\bord0\\1c&H44AA44&\\1a&H%X&"):format(0))
+            ass:draw_start(2)
+            for i, v in pairs(Thumbnailer.state.thumbnails) do
+                if i ~= closest_index and v == false then
                     ass:rect_cw(i*block_w, 0, (i+1)*block_w, framegraph_h)
                 end
             end

src/thumbnailer_server.lua

@@ -133,8 +133,8 @@ function generate_thumbnails(from_keypress)
     mp.commandv("script-message", "mpv_thumbnail_script-enabled")
 
     local generate_thumbnail_for_index = function(thumbnail_index)
-        local thumbnail_path = file_template:format(thumbnail_index)
-        local timestamp = math.min(file_duration, thumbnail_index * thumbnail_delta)
+
+        mp.commandv("script-message", "mpv_thumbnail_script-progress", tostring(thumbnail_index))
 
         -- The expected size (raw BGRA image)
         local thumbnail_raw_size = (thumbnail_size.w * thumbnail_size.h * 4)

src/thumbnailer_shared.lua

@@ -41,6 +41,10 @@ function Thumbnailer:on_thumb_ready(index)
     end
 end
 
+function Thumbnailer:on_thumb_progress(index)
+    self.state.thumbnails[index] = self.state.thumbnails[index] or false
+end
+
 function Thumbnailer:on_video_change(params)
     self:clear_state()
     if params ~= nil then
@@ -172,7 +176,7 @@ function Thumbnailer:get_closest(thumbnail_index)
 
     for index, value in pairs(self.state.thumbnails) do
         local distance = math.abs(index - thumbnail_index)
-        if distance < min_distance then
+        if distance < min_distance and value then
             min_distance = distance
             closest = index
         end
@@ -193,9 +197,14 @@ function Thumbnailer:get_thumbnail_path(time_position)
 end
 
 function Thumbnailer:register_client()
-    mp.register_script_message("mpv_thumbnail_script-ready", function(index, path) self:on_thumb_ready(tonumber(index), path) end)
     -- Wait for server to tell us we're live
     mp.register_script_message("mpv_thumbnail_script-enabled", function() self.state.enabled = true end)
+    mp.register_script_message("mpv_thumbnail_script-ready", function(index, path)
+        self:on_thumb_ready(tonumber(index), path)
+    end)
+    mp.register_script_message("mpv_thumbnail_script-progress", function(index, path)
+        self:on_thumb_progress(tonumber(index), path)
+    end)
 
     -- Notify server to generate thumbnails when video loads/changes
     mp.observe_property("video-dec-params", "native", function()