Improve Mac path discovery

README.md

@@ -41,6 +41,11 @@ It will be used in the background to generate thumbnails.
 The only exception is [ImPlay](https://tsl0922.github.io/ImPlay/), which can do thumbnailing on its own.  
 Set `mpv_path=ImPlay` in `script-opts/thumbfast.conf` and make sure it's in [Path](https://learn.microsoft.com/en-us/previous-versions/office/developer/sharepoint-2010/ee537574(v=office.14)#to-add-a-path-to-the-path-environment-variable).
 
+## MacOS
+If your mpv install is an app bundle (e.g. stolendata builds), the script will work but you may notice the Dock shakes when generating the first thumbnail.  
+To get rid of the shaking, make sure the app is in your Applications folder, then run: `sudo ln -s /Applications/mpv.app/Contents/MacOS/mpv /usr/local/mpv`  
+If you installed mpv via [Homebrew](https://brew.sh/), there are no issues.
+
 ## Configuration
 `socket`: On Windows, a plain string. On Linux and Mac, a directory path for temporary files. Leave empty for auto.  
 `thumbnail`: Path for the temporary thumbnail file (must not be a directory). Leave empty for auto.  

thumbfast.lua

@@ -250,8 +250,25 @@ end
 local mpv_path = options.mpv_path
 
 if mpv_path == "mpv" and os_name == "Mac" and unique then
+    -- TODO: look into ~~osxbundle/
     mpv_path = string.gsub(subprocess({"ps", "-o", "comm=", "-p", tostring(unique)}).stdout, "[\n\r]", "")
-    mpv_path = string.gsub(mpv_path, "/mpv%-bundle$", "/mpv")
+    if mpv_path ~= "mpv" then
+        mpv_path = string.gsub(mpv_path, "/mpv%-bundle$", "/mpv")
+        local mpv_bin = mp.utils.file_info("/usr/local/mpv")
+        if mpv_bin and mpv_bin.is_file then
+            mpv_path = "/usr/local/mpv"
+        else
+            local mpv_app = mp.utils.file_info("/Applications/mpv.app/Contents/MacOS/mpv")
+            if mpv_app and mpv_app.is_file then
+                mp.msg.warn("symlink mpv to fix Dock icons: `sudo ln -s /Applications/mpv.app/Contents/MacOS/mpv /usr/local/mpv`")
+            --elseif string.match(mpv_path, "^/private/") then
+            --    mp.msg.warn("symlink mpv to fix Dock icons: `sudo ln -s 'PATH_TO_MPV_INSTALL_DIR/mpv.app/Contents/MacOS/mpv' /usr/local/mpv`")
+            else
+            --    mp.msg.warn("symlink mpv to fix Dock icons: `sudo ln -s '"..mpv_path.."' /usr/local/mpv`")
+                mp.msg.warn("drag to your Applications folder and symlink mpv to fix Dock icons: `sudo ln -s /Applications/mpv.app/Contents/MacOS/mpv /usr/local/mpv`")
+            end
+        end
+    end
 end
 
 local function vf_string(filters, full)
@@ -371,6 +388,10 @@ local function spawn(time)
         table.insert(args, "--sws-allow-zimg=no")
     end
 
+    if os_name == "Mac" and mp.get_property("macos-app-activation-policy") then
+        table.insert(args, "--macos-app-activation-policy=accessory")
+    end
+
     if os_name == "Windows" then
         table.insert(args, "--input-ipc-server="..options.socket)
     else