mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix reviewed changes

Browse source
This commit is contained in:
sxyazi 2026-01-11 13:19:45 +08:00
parent dce7115850
commit d3abfffbaa
No known key found for this signature in database
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
yazi-plugin/preset/plugins/archive.lua
View file

@ -110,7 +110,7 @@ end
function M.list_archive(args, skip, limit) function M.list_archive(args, skip, limit)
local child = M.spawn_7z { "l", "-ba", "-slt", "-sccUTF-8", table.unpack(args) } local child = M.spawn_7z { "l", "-ba", "-slt", "-sccUTF-8", table.unpack(args) }
if not child then if not child then
return {}, 0, Err("Failed to start either `7zz` or `7z`. Do you have 7-zip installed?") return {}, Err("Failed to start either `7zz` or `7z`. Do you have 7-zip installed?")
end end
local files, err = M.parse_7z_slt(child, skip, limit) local files, err = M.parse_7z_slt(child, skip, limit)
@ -131,7 +131,7 @@ function M.list_compressed_tar(args, skip, limit)
{ "l", "-ba", "-slt", "-ttar", "-sccUTF-8", "-si" } { "l", "-ba", "-slt", "-ttar", "-sccUTF-8", "-si" }
) )
if not dst then if not dst then
return {}, 0, Err("Failed to start either `7zz` or `7z`. Do you have 7-zip installed?") return {}, Err("Failed to start either `7zz` or `7z`. Do you have 7-zip installed?")
end end
local files, err = M.parse_7z_slt(dst, skip, limit) local files, err = M.parse_7z_slt(dst, skip, limit)
@ -141,12 +141,14 @@ function M.list_compressed_tar(args, skip, limit)
return files, err return files, err
end end
---@param path Path
---@return table?
function M.list_if_only_one(path) function M.list_if_only_one(path)
-- For certain compressed tarballs (e.g. .tar.xz), -- For certain compressed tarballs (e.g. .tar.xz),
-- 7-zip doesn't print a .tar file if -slt is specified, so we are not doing that here -- 7-zip doesn't print a .tar file if -slt is specified, so we are not doing that here
local child = M.spawn_7z { "l", "-ba", "-sccUTF-8", "-p", tostring(path) } local child = M.spawn_7z { "l", "-ba", "-sccUTF-8", "-p", tostring(path) }
if not child then if not child then
return false return
end end
local files = {} local files = {}
@ -273,9 +275,12 @@ function M.parse_7z_slt(child, skip, limit)
::continue:: ::continue::
until #files > skip + limit until #files > skip + limit
if files[#files].path == Path.os("") then if files[#files].path == empty then
files[#files] = nil files[#files] = nil
else
M.treelize(files, parents)
end end
if #stderr ~= 0 then if #stderr ~= 0 then
err = Err("7-zip errored out while listing files, stderr: %s", table.concat(stderr, "\n")) err = Err("7-zip errored out while listing files, stderr: %s", table.concat(stderr, "\n"))
end end