feat: replace pngpaste with pbctl

Author: hakonharnes

README.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)
+- **MacOS:** [pbctl](https://github.com/hakonharnes/pbctl)
 - **Windows:** No additional requirements
 
 > [!IMPORTANT]

doc/img-clip.nvim.txt

@@ -40,7 +40,7 @@ FEATURES                                *img-clip.nvim-img-clip.nvim-features*
 REQUIREMENTS                        *img-clip.nvim-img-clip.nvim-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>
+- **MacOS:** pbctl <https://github.com/hakonharnes/pbctl>
 - **Windows:** No additional requirements
 
 

lua/img-clip/clipboard.lua

@@ -16,7 +16,9 @@ M.get_clip_cmd = function()
 
   -- MacOS
   elseif util.has("mac") then
-    if util.executable("pngpaste") then
+    if util.executable("pbctl") then
+      M.clip_cmd = "pbctl"
+    elseif util.executable("pngpaste") then
       M.clip_cmd = "pngpaste"
     end
 
@@ -48,8 +50,14 @@ M.content_is_image = function()
     local output = util.execute("wl-paste --list-types")
     return output ~= nil and output:find("image/png") ~= nil
 
+    -- MacOS (pbctl)
+  elseif cmd == "pbctl" then
+    local output, exit_code = util.execute("pbctl types")
+    return output ~= nil and output:find("image/") ~= nil
+
   -- MacOS (pngpaste)
   elseif cmd == "pngpaste" then
+    util.warn("`pngpaste` is deprecated. Install `pbctl` instead")
     local _, exit_code = util.execute("pngpaste -")
     return exit_code == 0
 
@@ -83,6 +91,12 @@ M.save_image = function(file_path)
     local _, exit_code = util.execute(command)
     return exit_code == 0
 
+    -- MacOS (pbctl)
+  elseif cmd == "pbctl" then
+    local command = string.format('pbctl paste %s> "%s"', process_cmd:gsub("%%", "%%%%"), file_path)
+    local _, exit_code = util.execute(command)
+    return exit_code == 0
+
   -- MacOS (pngpaste)
   elseif cmd == "pngpaste" then
     local command = string.format('pngpaste - %s> "%s"', process_cmd:gsub("%%", "%%%%"), file_path)
@@ -123,7 +137,14 @@ M.get_content = function()
       return output:match("^[^\n]+")
     end
 
-  -- MacOS
+  -- MacOS (pbctl)
+  elseif cmd == "pbctl" then
+    local output, exit_code = util.execute("pbctl paste")
+    if exit_code == 0 then
+      return output:match("^[^\n]+")
+    end
+
+  -- MacOS (pngpaste)
   elseif cmd == "pngpaste" then
     local output, exit_code = util.execute("pbpaste")
     if exit_code == 0 then
@@ -163,6 +184,13 @@ M.get_base64_encoded_image = function()
       return output
     end
 
+    -- MacOS (pbctl)
+  elseif cmd == "pbctl" then
+    local output, exit_code = util.execute("pbctl paste " .. process_cmd .. "| base64 | tr -d '\n'")
+    if exit_code == 0 then
+      return output
+    end
+
   -- MacOS (pngpaste)
   elseif cmd == "pngpaste" then
     local output, exit_code = util.execute("pngpaste - " .. process_cmd .. "| base64 | tr -d '\n'")

lua/img-clip/health.lua

@@ -5,6 +5,7 @@ local M = {}
 local ok = vim.health.ok or vim.health.report_ok
 local start = vim.health.start or vim.health.report_start
 local error = vim.health.error or vim.health.report_error
+local warn = vim.health.warn or vim.health.report_warn
 
 M.check = function()
   start("img-clip.nvim")
@@ -27,10 +28,12 @@ M.check = function()
 
   -- MacOS
   elseif util.has("mac") then
-    if util.executable("pngpaste") then
-      ok("`pngpaste` is installed")
+    if util.executable("pbctl") then
+      ok("`pbctl` is installed")
+    elseif util.executable("pngpaste") then
+      warn("`pngpaste` is deprecated. Install `pbctl` instead")
     else
-      error("`pngpaste` is not installed")
+      error("`pbctl` is not installed")
     end
 
   -- Windows

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)
+- **MacOS:** [pbctl](https://github.com/hakonharnes/pbctl)
 - **Windows:** No additional requirements
 
 > [!IMPORTANT]