a temporary fix for vfs/delete

This commit is contained in:
kepler155c@gmail.com 2020-05-07 21:34:50 -06:00
parent 4e6c5172d1
commit 8b14399a20
7 changed files with 25 additions and 23 deletions

View File

@ -30,7 +30,7 @@ end
local REGISTRY_DIR = 'usr/.registry'
-- icon:gsub('.', function(b) return '\\' .. b:byte() end)
-- iconExt:gsub('.', function(b) return '\\' .. b:byte() end)
local DEFAULT_ICON = NFT.parse('\30\55\31\48\136\140\140\140\132\
\30\48\31\55\149\31\48\128\128\128\30\55\149\
\30\55\31\48\138\143\143\143\133')

View File

@ -39,7 +39,7 @@ local page = UI.Page {
},
accelerators = {
[ 'control-q' ] = 'quit',
space = 'activate',
[ ' ' ] = 'activate',
t = 'terminate',
},
eventHandler = function (self, event)

View File

@ -100,6 +100,26 @@ end
function nativefs.delete(node, dir)
if node.mountPoint == dir then
fs.unmount(dir)
-- hack here
-- if a file is mounted over an existing directory
-- ie. sys/apps/MOUNT.LUA
-- then sys and sys/apps are created as temp nodes
-- therefore, trying to delete sys will was only
-- removing the node and not deleting the directory
-- Need a better way to backfill nodes in a way
-- that preserves the vfs functionality
-- perhaps a flag that denotes that this is a
-- file/directory is the actual mount
-- this hack will not fix
-- rm packages/common
-- where packages is linked from a drive
-- and urls are mounted under packages/common
-- (as the fstype will be linkfs)
if node.fstype == 'nativefs' then
fs.native.delete(dir)
end
else
fs.native.delete(dir)
end

View File

@ -16,7 +16,7 @@ UI.Checkbox.defaults = {
height = 1,
width = 3,
accelerators = {
space = 'checkbox_toggle',
[ ' ' ] = 'checkbox_toggle',
mouse_click = 'checkbox_toggle',
}
}

View File

@ -14,7 +14,7 @@ UI.CheckboxGrid.defaults = {
UIElement = 'CheckboxGrid',
checkedKey = 'checked',
accelerators = {
space = 'grid_toggle',
[ ' ' ] = 'grid_toggle',
key_enter = 'grid_toggle',
},
}

View File

@ -15,7 +15,7 @@ UI.Chooser.defaults = {
rightIndicator = UI.extChars and '\187' or '>',
height = 1,
accelerators = {
space = 'choice_next',
[ ' ' ] = 'choice_next',
right = 'choice_next',
left = 'choice_prev',
}

View File

@ -730,24 +730,6 @@ function Util.parse(...)
return args, options
end
function Util.args(arg)
local options, args = { }, { }
local k = 1
while k <= #arg do
local v = arg[k]
if _ssub(v, 1, 1) == '-' then
local opt = _ssub(v, 2)
options[opt] = arg[k + 1]
k = k + 1
else
table.insert(args, v)
end
k = k + 1
end
return options, args
end
-- http://lua-users.org/wiki/AlternativeGetOpt
local function getopt( arg, options )
local tab = {}