AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-11 00:09:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix and improve the tab complete in sh

Browse Source 
use path as given by user in sh shell in tab completion, and do not show resolved path

don't add space to single directory completion in case user wants to add more directories

escape magic chars in possible hint handler from user input on command line
This commit is contained in:
payonel 2015-09-12 22:57:36 -07:00
parent 4e4e5d3ba3
commit da2c5ed305
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua
View File

@ -384,6 +384,10 @@ end
local args, options = shell.parse(...) local args, options = shell.parse(...)
local history = {} local history = {}
local function escapeMagic(text)
return text:gsub('[%(%)%.%%%+%-%*%?%[%^%$]', '%%%1')
end
local function getMatchingPrograms(baseName) local function getMatchingPrograms(baseName)
local result = {} local result = {}
-- TODO only matching files with .lua extension for now, might want to -- TODO only matching files with .lua extension for now, might want to
@ -391,7 +395,7 @@ local function getMatchingPrograms(baseName)
if not baseName or #baseName == 0 then if not baseName or #baseName == 0 then
baseName = "^(.*)%.lua$" baseName = "^(.*)%.lua$"
else else
baseName = "^(" .. baseName .. ".*)%.lua$" baseName = "^(" .. escapeMagic(baseName) .. ".*)%.lua$"
end end
for basePath in string.gmatch(os.getenv("PATH"), "[^:]+") do for basePath in string.gmatch(os.getenv("PATH"), "[^:]+") do
for file in fs.list(basePath) do for file in fs.list(basePath) do
@ -404,7 +408,8 @@ local function getMatchingPrograms(baseName)
return result return result
end end
local function getMatchingFiles(baseName) local function getMatchingFiles(partialPrefix, name)
local baseName = shell.resolve(partialPrefix .. name)
local result, basePath = {} local result, basePath = {}
-- note: we strip the trailing / to make it easier to navigate through -- note: we strip the trailing / to make it easier to navigate through
-- directories using tab completion (since entering the / will then serve -- directories using tab completion (since entering the / will then serve
@ -416,12 +421,12 @@ local function getMatchingFiles(baseName)
baseName = "^(.-)/?$" baseName = "^(.-)/?$"
else else
basePath = fs.path(baseName) or "/" basePath = fs.path(baseName) or "/"
baseName = "^(" .. fs.name(baseName) .. ".-)/?$" baseName = "^(" .. escapeMagic(fs.name(baseName)) .. ".-)/?$"
end end
for file in fs.list(basePath) do for file in fs.list(basePath) do
local match = file:match(baseName) local match = file:match(baseName)
if match then if match then
table.insert(result, fs.concat(basePath, match)) table.insert(result, partialPrefix .. match)
end end
end end
-- (cont.) but if there's only one match and it's a directory, *then* we -- (cont.) but if there's only one match and it's a directory, *then* we
@ -444,10 +449,20 @@ local function hintHandler(line, cursor)
-- first part and no path, look for programs in the $PATH -- first part and no path, look for programs in the $PATH
result = getMatchingPrograms(line) result = getMatchingPrograms(line)
else -- just look normal files else -- just look normal files
result = getMatchingFiles(shell.resolve(partial or line)) local partialPrefix = (partial or line)
local name = fs.name(partialPrefix)
partialPrefix = partialPrefix:sub(1, -name:len() - 1)
result = getMatchingFiles(partialPrefix, name)
end end
local resultSuffix = ""
if searchInPath then
resultSuffix = " "
elseif #result == 1 and result[1]:sub(-1) ~= '/' then
resultSuffix = " "
end
prefix = prefix or ""
for i = 1, #result do for i = 1, #result do
result[i] = (prefix or "") .. result[i] .. (searchInPath and " " or "") result[i] = prefix .. result[i] .. resultSuffix
end end
table.sort(result) table.sort(result)
return result return result