MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

shellex: fix ls on netfs dirs

Browse Source
This commit is contained in:
kepler155c@gmail.com
2019-05-14 05:58:07 -04:00
parent 180f0f9b93
commit 4a6fa305f4
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shellex/ls.lua
View File

@@ -50,7 +50,6 @@ local function stat(names, index)
info.sort_name = info.name:gsub("^%.","") info.sort_name = info.name:gsub("^%.","")
info.isLink, info.link = fs.isLink(info.full_path) info.isLink, info.link = fs.isLink(info.full_path)
info.size = info.isLink and 0 or fs.size(info.full_path) info.size = info.isLink and 0 or fs.size(info.full_path)
info.fs = fs.get(info.full_path)
info.ext = info.name:match("(%.[^.]+)$") or "" info.ext = info.name:match("(%.[^.]+)$") or ""
names[index] = info names[index] = info
return info return info
@@ -248,7 +247,10 @@ local function display(names)
local info = stat(names, index) local info = stat(names, index)
local file_type = info.isLink and 'l' or info.isDir and 'd' or 'f' local file_type = info.isLink and 'l' or info.isDir and 'd' or 'f'
local link_target = info.isLink and string.format(" -> %s", info.link:gsub("/+$", "") .. (info.isDir and "/" or "")) or "" local link_target = info.isLink and string.format(" -> %s", info.link:gsub("/+$", "") .. (info.isDir and "/" or "")) or ""
local write_mode = info.fs.isReadOnly() and '-' or 'w' pcall(function()
info.fs = fs.get(info.full_path)
end)
local write_mode = info.fs and info.fs.isReadOnly() and '-' or 'w'
local size = formatSize(info.size) local size = formatSize(info.size)
local format = "%s-r%s %+"..tostring(max_size_width)..'s ' local format = "%s-r%s %+"..tostring(max_size_width)..'s '
local meta = string.format(format, file_type, write_mode, size) local meta = string.format(format, file_type, write_mode, size)
@@ -380,16 +382,19 @@ end
io.output():setvbuf("line") io.output():setvbuf("line")
--local ok, msg = pcall(function() local ok, msg = pcall(function()
if #file_set > 0 then display(sort(file_set)) end if #file_set > 0 then display(sort(file_set)) end
displayDirList(dir_set) displayDirList(dir_set)
msft.final() msft.final()
--end) end)
io.output():flush() io.output():flush()
io.output():setvbuf("no") io.output():setvbuf("no")
set_color() set_color()
--assert(ok, msg) if not ok then
error(msg, 2)
end
assert(ok, msg)
return ec return ec