chore: make pngpaste mandatory and remove osascript

Author: hakonharnes

lua/img-clip/clipboard.lua

@@ -18,8 +18,6 @@ M.get_clip_cmd = function()
   elseif util.has("mac") then
     if util.executable("pngpaste") then
       M.clip_cmd = "pngpaste"
-    elseif util.executable("osascript") then
-      M.clip_cmd = "osascript"
     end
 
   -- Linux (Wayland)
@@ -50,16 +48,11 @@ M.content_is_image = function()
     local output = util.execute("wl-paste --list-types")
     return output ~= nil and output:find("image/png") ~= nil
 
-  -- MacOS (pngpaste) which is faster than osascript
+  -- MacOS (pngpaste) 
   elseif cmd == "pngpaste" then
     local _, exit_code = util.execute("pngpaste -")
     return exit_code == 0
 
-  -- MacOS (osascript) as a fallback
-  elseif cmd == "osascript" then
-    local output = util.execute("osascript -e 'clipboard info'")
-    return output ~= nil and output:find("class PNGf") ~= nil
-
   -- Windows
   elseif cmd == "powershell.exe" then
     local output =
@@ -90,26 +83,12 @@ M.save_image = function(file_path)
     local _, exit_code = util.execute(command)
     return exit_code == 0
 
-  -- MacOS (pngpaste) which is faster than osascript
+  -- MacOS (pngpaste) 
   elseif cmd == "pngpaste" then
     local command = string.format('pngpaste - %s> "%s"', process_cmd:gsub("%%", "%%%%"), file_path)
     local _, exit_code = util.execute(command)
     return exit_code == 0
 
-  -- MacOS (osascript) as a fallback
-  elseif cmd == "osascript" then
-    local command = string.format(
-      [[osascript -e 'set theFile to (open for access POSIX file "%s" with write permission)' ]]
-        .. [[-e 'try' -e 'write (the clipboard as «class PNGf») to theFile' -e 'end try' ]]
-        .. [[-e 'close access theFile' -e 'do shell script "cat %s %s> %s"']],
-      file_path,
-      file_path,
-      process_cmd:gsub("%%", "%%%%"),
-      file_path
-    )
-    local _, exit_code = util.execute(command)
-    return exit_code == 0
-
   -- Windows
   elseif cmd == "powershell.exe" then
     local command = string.format(
@@ -145,17 +124,12 @@ M.get_content = function()
     end
 
   -- MacOS
-  elseif cmd == "pngpaste" or cmd == "osascript" then
+  elseif cmd == "pngpaste" then
     local output, exit_code = util.execute("pbpaste")
     if exit_code == 0 then
       return output:match("^[^\n]+")
     end
 
-    output, exit_code = util.execute([[osascript -e 'get the clipboard as text']])
-    if exit_code == 0 then
-      return output:match("^[^\n]+")
-    end
-
   -- Windows
   elseif cmd == "powershell.exe" then
     local output, exit_code = util.execute([[powershell -command "Get-Clipboard"]])
@@ -196,19 +170,6 @@ M.get_base64_encoded_image = function()
       return output
     end
 
-  -- MacOS (osascript)
-  elseif cmd == "osascript" then
-    local output, exit_code = util.execute(
-      [[osascript -e 'set theFile to (open for access POSIX file "/tmp/image.png" with write permission)' ]]
-        .. [[-e 'try' -e 'write (the clipboard as «class PNGf») to theFile' -e 'end try' -e 'close access theFile'; ]]
-        .. [[/tmp/image.png ]]
-        .. process_cmd
-        .. [[ | base64 | tr -d "\n" ]]
-    )
-    if exit_code == 0 then
-      return output
-    end
-
   -- Windows
   elseif cmd == "powershell.exe" then
     local output, exit_code = util.execute(

lua/img-clip/health.lua

@@ -28,15 +28,10 @@ M.check = function()
 
   -- MacOS
   elseif util.has("mac") then
-    if util.executable("osascript") then
-      ok("`osascript` is installed")
-    else
-      error("`osascript` is not installed")
-    end
     if util.executable("pngpaste") then
       ok("`pngpaste` is installed")
     else
-      warn("`pngpaste` is not installed")
+      error("`pngpaste` is not installed")
     end
 
   -- Windows

tests/clipboard_spec.lua

@@ -153,7 +153,7 @@ describe("clipboard", function()
           return nil
         end
         util.executable = function(cmd)
-          return cmd == "pngpaste" or cmd == "osascript"
+          return cmd == "pngpaste" 
         end
       end)
 
@@ -198,61 +198,6 @@ describe("clipboard", function()
         assert.is_true(clipboard.save_image("/path/to/image.png"))
       end)
     end)
-
-    describe("osascript", function()
-      before_each(function()
-        util.has = function(feature)
-          return feature == "mac"
-        end
-        os.getenv = function()
-          return nil
-        end
-        util.executable = function(cmd)
-          return cmd == "osascript"
-        end
-      end)
-
-      it("returns 'osascript' as the clipboard command", function()
-        assert.equals("osascript", clipboard.get_clip_cmd())
-      end)
-
-      it("returns true if clipboard content is an image", function()
-        util.execute = function(command)
-          assert(command:match("osascript"))
-          return "class PNGf", 0 -- output of osascript
-        end
-
-        assert.is_true(clipboard.content_is_image())
-      end)
-
-      it("returns false if clipboard content is not an image", function()
-        util.execute = function(command)
-          assert(command:match("osascript"))
-          return "Text", 1 -- output of osascript
-        end
-
-        assert.is_false(clipboard.content_is_image())
-      end)
-
-      it("gets first line of clipboard content", function()
-        util.execute = function(command)
-          assert(command:match("pbpaste"))
-          return [[first line
-        second line]], 0
-        end
-
-        assert.equals("first line", clipboard.get_content())
-      end)
-
-      it("successfully saves an image", function()
-        util.execute = function(command)
-          assert(command:match("osascript"))
-          return nil, 0 -- simulate successful execution
-        end
-
-        assert.is_true(clipboard.save_image("/path/to/image.png"))
-      end)
-    end)
   end)
 
   -- Windows (including WSL)

vimdoc.md

@@ -20,7 +20,7 @@ https://github.com/HakonHarnes/img-clip.nvim/assets/89907156/ab4edc10-d296-4532-
 ## 🔧 Requirements
 
 - **Linux:** [xclip](https://github.com/astrand/xclip) (x11) or [wl-clipboard](https://github.com/bugaevc/wl-clipboard) (wayland)
-- **MacOS:** [pngpaste](https://github.com/jcsalterego/pngpaste) (optional, but recommended)
+- **MacOS:** [pngpaste](https://github.com/jcsalterego/pngpaste)
 - **Windows:** No additional requirements
 
 > [!IMPORTANT]