fix: correctly handle CRLF on Windows in preset archive and json …

…plugins (#2017)
sxyazi · Dec 9, 2024 · 7498b97 · 7498b97
1 parent a743488
commit 7498b97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/yazi-plugin/preset/plugins/archive.lua b/yazi-plugin/preset/plugins/archive.lua
@@ -110,7 +110,7 @@ function M.list_files(args, skip, limit)
 			goto continue
 		end
 
-		key, value = next:match("^(%u%l+) = (.+)[\r\n]+")
+		key, value = next:match("^(%u%l+) = (.-)[\r\n]+")
 		if key == "Path" then
 			files[#files].path = value
 		elseif key == "Size" then

diff --git a/yazi-plugin/preset/plugins/json.lua b/yazi-plugin/preset/plugins/json.lua
@@ -2,12 +2,7 @@ local M = {}
 
 function M:peek(job)
 	local child = Command("jq")
-		:args({
-			"-C",
-			"--tab",
-			".",
-			tostring(job.file.url),
-		})
+		:args({ "-b", "-C", "--tab", ".", tostring(job.file.url) })
 		:stdout(Command.PIPED)
 		:stderr(Command.PIPED)
 		:spawn()