Guard against nil properties.

Author: blank_name

src/thumbnailer_server.lua

@@ -13,7 +13,7 @@ function create_thumbnail_mpv(file_path, timestamp, size, output_path, options)
                                                        or thumbnailer_options.remote_direct_stream)
 
     local header_fields_arg = nil
-    local header_fields = mp.get_property_native("http-header-fields")
+    local header_fields = mp.get_property_native("http-header-fields", {})
     if #header_fields > 0 then
         -- We can't escape the headers, mpv won't parse "--http-header-fields='Name: value'" properly
         header_fields_arg = "--http-header-fields=" .. table.concat(header_fields, ",")
@@ -36,8 +36,8 @@ function create_thumbnail_mpv(file_path, timestamp, size, output_path, options)
         -- Pass HTTP headers from current instance
         header_fields_arg,
         -- Pass User-Agent and Referer - should do no harm even with ytdl active
-        "--user-agent=" .. mp.get_property_native("user-agent"),
-        "--referrer=" .. mp.get_property_native("referrer"),
+        "--user-agent=" .. mp.get_property_native("user-agent", ""),
+        "--referrer=" .. mp.get_property_native("referrer", ""),
         -- Disable hardware decoding
         "--hwdec=no",
 
@@ -146,6 +146,11 @@ function do_worker_job(state_json_string, frames_json_string)
     end
 
     local file_duration = mp.get_property_native("duration")
+    -- Bail if we get a nil duration
+    if not file_duration then
+      return
+    end
+
     local file_path = thumb_state.worker_input_path
 
     if thumb_state.is_remote then
@@ -270,4 +275,4 @@ register_timer = mp.add_periodic_timer(0.1, register_function)
 mp.register_script_message("mpv_thumbnail_script-slaved", function()
     msg.debug("Successfully registered with master")
     register_timer:stop()
-end)
+end)

src/thumbnailer_shared.lua

@@ -93,13 +93,13 @@ function Thumbnailer:update_state()
 
     self.state.ready = true
 
-    local file_path = mp.get_property_native("path")
+    local file_path = mp.get_property_native("path", "")
     self.state.is_remote = file_path:find("://") ~= nil
 
     self.state.available = false
 
     -- Make sure the file has video (and not just albumart)
-    local track_list = mp.get_property_native("track-list")
+    local track_list = mp.get_property_native("track-list", {})
     local has_video = false
     for i, track in pairs(track_list) do
         if track.type == "video" and not track.external and not track.albumart then
@@ -118,10 +118,10 @@ end
 
 
 function Thumbnailer:get_thumbnail_template()
-    local file_path = mp.get_property_native("path")
+    local file_path = mp.get_property_native("path", "")
     local is_remote = file_path:find("://") ~= nil
 
-    local filename = mp.get_property_native("filename/no-ext")
+    local filename = mp.get_property_native("filename/no-ext", "")
     local filesize = mp.get_property_native("file-size", 0)
 
     if is_remote then
@@ -143,7 +143,7 @@ end
 
 
 function Thumbnailer:get_thumbnail_size()
-    local video_dec_params = mp.get_property_native("video-dec-params")
+    local video_dec_params = mp.get_property_native("video-dec-params", {})
     local video_width = video_dec_params.dw
     local video_height = video_dec_params.dh
     if not (video_width and video_height) then
@@ -163,7 +163,7 @@ end
 
 
 function Thumbnailer:get_delta()
-    local file_path = mp.get_property_native("path")
+    local file_path = mp.get_property_native("path", "")
     local file_duration = mp.get_property_native("duration")
     local is_seekable = mp.get_property_native("seekable")
 
@@ -201,8 +201,8 @@ function Thumbnailer:get_thumbnail_count(delta)
     if delta == nil then
         return 0
     end
-    local file_duration = mp.get_property_native("duration")
 
+    local file_duration = mp.get_property_native("duration", 0)
     return math.ceil(file_duration / delta)
 end
 
@@ -320,13 +320,13 @@ function Thumbnailer:_create_thumbnail_job_order()
 end
 
 function Thumbnailer:prepare_source_path()
-    local file_path = mp.get_property_native("path")
+    local file_path = mp.get_property_native("path", "")
 
     if self.state.is_remote and thumbnailer_options.remote_direct_stream then
         -- Use the direct stream (possibly) provided by ytdl
         -- This skips ytdl on the sub-calls, making the thumbnailing faster
         -- Works well on YouTube, rest not really tested
-        file_path = mp.get_property_native("stream-path")
+        file_path = mp.get_property_native("stream-path", "")
 
         -- edl:// urls can get LONG. In which case, save the path (URL)
         -- to a temporary file and use that instead.
@@ -336,7 +336,7 @@ function Thumbnailer:prepare_source_path()
             -- Path is too long for a playlist - just pass the original URL to
             -- workers and allow ytdl
             self.state.worker_extra.enable_ytdl = true
-            file_path = mp.get_property_native("path")
+            file_path = mp.get_property_native("path", "")
             msg.warn("Falling back to original URL and ytdl due to LONG source path. This will be slow.")
 
         elseif #file_path > 1024 then