SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正文件加载模块参数识别的小问题

Browse Source
This commit is contained in:
MrZ626
2021-12-06 19:52:00 +08:00
parent 55cf95f218
commit b22b0e0194
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Zframework/file.lua
View File

@@ -6,7 +6,14 @@ function FILE.load(name,args)
local F=fs.newFile(name) local F=fs.newFile(name)
assert(F:open'r','open error') assert(F:open'r','open error')
local s=F:read()F:close() local s=F:read()F:close()
if args:sArg'-luaon'or args==''and s:sub(1,6)=='return{'then local mode=
args:sArg'-luaon'and'luaon'or
args:sArg'-json'and'json'or
args:sArg'-string'and'string'or
s:sub(1,6)=='return{'and'luaon'or
(s:sub(1,1)=='['and s:sub(-1)==']'or s:sub(1,1)=='{'and s:sub(-1)=='}')and'json'or
'string'
if mode=='luaon'then
local func=loadstring(s) local func=loadstring(s)
if func then if func then
setfenv(func,{}) setfenv(func,{})
@@ -15,13 +22,13 @@ function FILE.load(name,args)
else else
error('decode error') error('decode error')
end end
elseif args:sArg'-json'or args==''and s:sub(1,1)=='['and s:sub(-1)==']'or s:sub(1,1)=='{'and s:sub(-1)=='}'then elseif mode=='json'then
local res=JSON.decode(s) local res=JSON.decode(s)
if res then if res then
return res return res
end end
error('decode error') error('decode error')
elseif args:sArg'-string'or args==''then elseif mode=='string'then
return s return s
else else
error('unknown mode') error('unknown mode')