mirror of
https://github.com/sxyazi/yazi.git
synced 2026-07-25 08:41:05 +00:00
Ensure the same shape of file with make_file()
This commit is contained in:
sxyazi
parent
8f0cb6a61d
commit
b06380e22a
2 changed files with 30 additions and 39 deletions
|
|
@ -1 +1 @@
|
||||||
{"flagWords":[],"words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied","thiserror","memchr","memmem","russh","deadpool","keepalive","nodelay","publickey","deadpool","initing"],"version":"0.2","language":"en"}
|
{"language":"en","flagWords":[],"words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied","thiserror","memchr","memmem","russh","deadpool","keepalive","nodelay","publickey","deadpool","initing","treelize"],"version":"0.2"}
|
||||||
|
|
@ -14,13 +14,11 @@ function M:peek(job)
|
||||||
elseif job.skip > 0 and bound < job.skip + limit then
|
elseif job.skip > 0 and bound < job.skip + limit then
|
||||||
return ya.emit("peek", { math.max(0, bound - limit), only_if = job.file.url, upper_bound = true })
|
return ya.emit("peek", { math.max(0, bound - limit), only_if = job.file.url, upper_bound = true })
|
||||||
elseif #files == 0 then
|
elseif #files == 0 then
|
||||||
files = { { path = Path.os(job.file.url.stem), size = 0, packed_size = 0, attr = "" } }
|
files = { M.make_file { path = job.file.url.stem } }
|
||||||
end
|
end
|
||||||
|
|
||||||
files = M.prepare_tree(files)
|
|
||||||
|
|
||||||
local left, right = {}, {}
|
local left, right = {}, {}
|
||||||
for _, f in ipairs(files) do
|
for _, f in ipairs(M.treelize(files)) do
|
||||||
local icon = File({
|
local icon = File({
|
||||||
url = Url(f.path),
|
url = Url(f.path),
|
||||||
cha = Cha { mode = tonumber(f.is_dir and "40700" or "100644", 8) },
|
cha = Cha { mode = tonumber(f.is_dir and "40700" or "100644", 8) },
|
||||||
|
|
@ -158,8 +156,7 @@ function M.list_if_only_one(path)
|
||||||
if event == 0 then
|
if event == 0 then
|
||||||
local attr, size, packed_size, path = next:sub(20):match("([^ ]+) +(%d+) +(%d+) +([^\r\n]+)")
|
local attr, size, packed_size, path = next:sub(20):match("([^ ]+) +(%d+) +(%d+) +([^\r\n]+)")
|
||||||
if path then
|
if path then
|
||||||
files[#files + 1] =
|
files[#files + 1] = M.make_file { path = path, size = size, packed_size = packed_size, attr = attr }
|
||||||
{ path = Path.os(path), size = tonumber(size), packed_size = tonumber(packed_size), attr = attr }
|
|
||||||
end
|
end
|
||||||
elseif event ~= 1 then
|
elseif event ~= 1 then
|
||||||
break
|
break
|
||||||
|
|
@ -217,6 +214,16 @@ function M.is_encrypted(s) return s:find(" Wrong password", 1, true) end
|
||||||
|
|
||||||
function M.is_tar(path) return M.list_meta { "-p", tostring(path) } == "tar" end
|
function M.is_tar(path) return M.list_meta { "-p", tostring(path) } == "tar" end
|
||||||
|
|
||||||
|
function M.make_file(fields)
|
||||||
|
fields = fields or {}
|
||||||
|
fields.path = type(fields.path or "") == "string" and Path.os(fields.path or "") or fields.path
|
||||||
|
fields.size = tonumber(fields.size) or 0
|
||||||
|
fields.packed_size = tonumber(fields.packed_size) or 0
|
||||||
|
fields.attr = fields.attr or ""
|
||||||
|
fields.folder = fields.folder or ""
|
||||||
|
return fields
|
||||||
|
end
|
||||||
|
|
||||||
function M.should_decompress_tar(file)
|
function M.should_decompress_tar(file)
|
||||||
return file.packed_size <= 1024 * 1024 * 1024 and (file.path.ext or ""):lower() == "tar"
|
return file.packed_size <= 1024 * 1024 * 1024 and (file.path.ext or ""):lower() == "tar"
|
||||||
end
|
end
|
||||||
|
|
@ -230,7 +237,7 @@ end
|
||||||
---@return integer bound
|
---@return integer bound
|
||||||
---@return Error? err
|
---@return Error? err
|
||||||
function M.parse_7z_slt(child, skip, limit)
|
function M.parse_7z_slt(child, skip, limit)
|
||||||
local i, files, err = 0, { { path = Path.os(""), size = 0, packed_size = 0, attr = "" } }, nil
|
local i, files, err = 0, { M.make_file() }, nil
|
||||||
local key, value, stderr = "", "", {}
|
local key, value, stderr = "", "", {}
|
||||||
repeat
|
repeat
|
||||||
local next, event = child:read_line()
|
local next, event = child:read_line()
|
||||||
|
|
@ -247,7 +254,7 @@ function M.parse_7z_slt(child, skip, limit)
|
||||||
if next == "\n" or next == "\r\n" then
|
if next == "\n" or next == "\r\n" then
|
||||||
i = i + 1
|
i = i + 1
|
||||||
if files[#files].path ~= Path.os("") then
|
if files[#files].path ~= Path.os("") then
|
||||||
files[#files + 1] = { path = Path.os(""), size = 0, packed_size = 0, attr = "" }
|
files[#files + 1] = M.make_file()
|
||||||
end
|
end
|
||||||
goto continue
|
goto continue
|
||||||
elseif i < skip then
|
elseif i < skip then
|
||||||
|
|
@ -279,55 +286,39 @@ function M.parse_7z_slt(child, skip, limit)
|
||||||
return files, i, err
|
return files, i, err
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.prepare_tree(files)
|
---Convert a flat list of files into a tree structure
|
||||||
|
---@param files table
|
||||||
|
---@return table tree
|
||||||
|
function M.treelize(files)
|
||||||
if #files == 0 then
|
if #files == 0 then
|
||||||
return
|
return files
|
||||||
end
|
end
|
||||||
|
|
||||||
local parent = files[1].path.parent
|
local parent = files[1].path.parent
|
||||||
while parent do
|
while parent do
|
||||||
table.insert(files, 1, {
|
table.insert(files, 1, M.make_file { path = parent, is_dir = true })
|
||||||
path = parent,
|
|
||||||
size = 0,
|
|
||||||
attr = "",
|
|
||||||
is_dir = true,
|
|
||||||
})
|
|
||||||
parent = parent.parent
|
parent = parent.parent
|
||||||
end
|
end
|
||||||
|
|
||||||
local tree = {}
|
local tree, parents, prev_parent = {}, {}, nil
|
||||||
local parents, prev_parent = {}, nil
|
for _, f in ipairs(files) do
|
||||||
for i, f in ipairs(files) do
|
|
||||||
if f.is_dir then
|
|
||||||
f.depth = i - 1
|
|
||||||
else
|
|
||||||
f.is_dir = f.folder == "+" or (f.attr and f.attr:sub(1, 1) == "D")
|
|
||||||
end
|
|
||||||
|
|
||||||
while #parents > 0 and not f.path:starts_with(parents[#parents]) do
|
while #parents > 0 and not f.path:starts_with(parents[#parents]) do
|
||||||
parents[#parents] = nil
|
parents[#parents] = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
f.depth = #parents
|
f.depth = #parents
|
||||||
|
f.is_dir = f.is_dir or f.folder == "+" or f.attr:sub(1, 1) == "D"
|
||||||
|
|
||||||
if f.is_dir then
|
if f.is_dir then
|
||||||
parents[#parents + 1] = f.path
|
parents[#parents + 1] = f.path
|
||||||
elseif prev_parent ~= f.path.parent then
|
elseif prev_parent ~= f.path.parent then
|
||||||
local parent = f.path.parent
|
local buf, parent = {}, f.path.parent
|
||||||
local dirs_to_add = {}
|
|
||||||
while parent and parent ~= parents[#parents] do
|
while parent and parent ~= parents[#parents] do
|
||||||
dirs_to_add[#dirs_to_add + 1] = parent
|
buf[#buf + 1], parent = parent, parent.parent
|
||||||
parent = parent.parent
|
|
||||||
end
|
end
|
||||||
for j = #dirs_to_add, 1, -1 do
|
for j = #buf, 1, -1 do
|
||||||
tree[#tree + 1] = {
|
tree[#tree + 1] = M.make_file { path = buf[j], depth = #parents, is_dir = true }
|
||||||
path = dirs_to_add[j],
|
parents[#parents + 1] = buf[j]
|
||||||
size = 0,
|
|
||||||
attr = "",
|
|
||||||
is_dir = true,
|
|
||||||
depth = #parents,
|
|
||||||
}
|
|
||||||
parents[#parents + 1] = dirs_to_add[j]
|
|
||||||
end
|
end
|
||||||
f.depth = #parents
|
f.depth = #parents
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue