Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added option to skip cache and piped stderr to /dev/null

Browse Source
This commit is contained in:
Bruce Hill 2019-01-06 15:25:08 -08:00
parent 467d6457f3
commit f0fc8c0cf6
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files.lua
View File

@ -33,13 +33,18 @@ Files.spoof = function(filename, contents)
_SPOOFED_FILES[filename] = contents _SPOOFED_FILES[filename] = contents
return filename return filename
end end
Files.read = function(filename) Files.read = function(filename, skip_cache)
if skip_cache == nil then
skip_cache = nil
end
if not (skip_cache) then
do do
local file_contents = _FILE_CACHE[filename] local file_contents = _FILE_CACHE[filename]
if file_contents then if file_contents then
return file_contents or nil return file_contents or nil
end end
end end
end
if filename == 'stdin' or filename == '-' then if filename == 'stdin' or filename == '-' then
local contents = io.read('*a') local contents = io.read('*a')
Files.spoof('stdin', contents) Files.spoof('stdin', contents)
@ -52,7 +57,9 @@ Files.read = function(filename)
end end
local contents = file:read("*a") local contents = file:read("*a")
file:close() file:close()
if not (skip_cache) then
_FILE_CACHE[filename] = contents _FILE_CACHE[filename] = contents
end
return contents or nil return contents or nil
end end
local match, gsub local match, gsub
@ -88,7 +95,7 @@ Files.list = function(path)
path path
} }
else else
_BROWSE_CACHE[path] = run_cmd('find -L "' .. path .. '" -not -path "*/\\.*" -type f') or false _BROWSE_CACHE[path] = run_cmd('find -L "' .. path .. '" -not -path "*/\\.*" -type f 2>/dev/null') or false
end end
end end
return _BROWSE_CACHE[path] return _BROWSE_CACHE[path]
@ -162,7 +169,7 @@ if ok then
return _BROWSE_CACHE[path] return _BROWSE_CACHE[path]
end end
else else
if not (run_cmd('find . -maxdepth 0')) then if not (run_cmd('find . -maxdepth 0 2>/dev/null')) then
local url local url
if jit then if jit then
url = 'https://github.com/spacewander/luafilesystem' url = 'https://github.com/spacewander/luafilesystem'

8
files.moon
View File

@ -23,7 +23,8 @@ Files.spoof = (filename, contents)->
return filename return filename
-- Read a file's contents -- Read a file's contents
Files.read = (filename)-> Files.read = (filename, skip_cache=nil)->
unless skip_cache
if file_contents = _FILE_CACHE[filename] if file_contents = _FILE_CACHE[filename]
return file_contents or nil return file_contents or nil
if filename == 'stdin' or filename == '-' if filename == 'stdin' or filename == '-'
@ -35,6 +36,7 @@ Files.read = (filename)->
return nil unless file return nil unless file
contents = file\read("*a") contents = file\read("*a")
file\close! file\close!
unless skip_cache
_FILE_CACHE[filename] = contents _FILE_CACHE[filename] = contents
return contents or nil return contents or nil
@ -59,7 +61,7 @@ Files.list = (path)->
local files local files
_BROWSE_CACHE[path] = if _SPOOFED_FILES[path] or path == 'stdin' or path == '-' _BROWSE_CACHE[path] = if _SPOOFED_FILES[path] or path == 'stdin' or path == '-'
{path} {path}
else run_cmd('find -L "'..path..'" -not -path "*/\\.*" -type f') or false else run_cmd('find -L "'..path..'" -not -path "*/\\.*" -type f 2>/dev/null') or false
return _BROWSE_CACHE[path] return _BROWSE_CACHE[path]
ok, lfs = pcall(require, "lfs") ok, lfs = pcall(require, "lfs")
@ -95,7 +97,7 @@ if ok
if f\match("^%./") then _BROWSE_CACHE[path][i] = f\sub(3) if f\match("^%./") then _BROWSE_CACHE[path][i] = f\sub(3)
return _BROWSE_CACHE[path] return _BROWSE_CACHE[path]
else else
unless run_cmd('find . -maxdepth 0') unless run_cmd('find . -maxdepth 0 2>/dev/null')
url = if jit url = if jit
'https://github.com/spacewander/luafilesystem' 'https://github.com/spacewander/luafilesystem'
else 'https://github.com/keplerproject/luafilesystem' else 'https://github.com/keplerproject/luafilesystem'