izaya
/
OC-KittenOS
mirror of https://github.com/20kdc/OC-KittenOS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove overwrite confirmations because life is short and UX nitpick bugs are long. 

Have fun with this. If anyone complains I'm calling it the April 1st release.
This commit is contained in:
20kdc 2020-03-31 18:10:55 +01:00
parent aef0043d4a
commit f761ad5824
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
code/libs/sys-filevfs.lua
View File

@ -94,11 +94,25 @@ function getFsNode(fs, parent, fsc, path, mode, impliedName)
for k, v in ipairs(fsc.list(path)) do for k, v in ipairs(fsc.list(path)) do
local nm = "F: " .. v local nm = "F: " .. v
local fp = path .. v local fp = path .. v
if fsc.isDirectory(fp) then local cDir = fsc.isDirectory(fp)
if cDir then
nm = "D: " .. v nm = "D: " .. v
end end
n[k + 1] = {nm, function () return nil, getFsNode(fs, t, fsc, fp, mode, impliedName) end} if (not cDir) and (fscrw or mode == false) and (mode ~= nil) then
local vn = v
n[k + 1] = {nm, function () return selectUnknown(vn) end}
else
n[k + 1] = {nm, function () return nil, getFsNode(fs, t, fsc, fp, mode, impliedName) end}
end
end end
else
table.insert(n, {"Copy", function ()
local rt, re = require("sys-filewrap").create(fsc, path, false)
if not rt then
return false, dialog("Open Error: " .. tostring(re), parent)
end
return nil, setupCopyVirtualEnvironment(fs, parent, rt, path:match("[^/]*$") or "")
end})
end end
if fscrw then if fscrw then
if dir then if dir then
@ -151,24 +165,6 @@ function getFsNode(fs, parent, fsc, path, mode, impliedName)
end end
end end
if not dir then if not dir then
table.insert(n, {"Copy", function ()
local rt, re = require("sys-filewrap").create(fsc, path, false)
if not rt then
return false, dialog("Open Error: " .. tostring(re), parent)
end
return nil, setupCopyVirtualEnvironment(fs, parent, rt, path:match("[^/]*$") or "")
end})
if (fscrw or mode == false) and (mode ~= nil) then
local tx = "Open"
if mode == true then
tx = "Save (Overwrite)"
elseif mode == "append" then
tx = "Append"
end
if fscrw or mode == false then
table.insert(n, {tx, selectUnknown})
end
end
elseif impliedName then elseif impliedName then
table.insert(n, {"Implied: " .. impliedName, function () table.insert(n, {"Implied: " .. impliedName, function ()
return selectUnknown(impliedName) return selectUnknown(impliedName)