aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improved table.json to santise strings

Browse Source
This commit is contained in:
Cooldude2606
2018-11-11 13:58:17 +00:00
parent 961dc3f34c
commit fc91e07dae
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ExpGamingLib/control.lua
View File

@@ -254,24 +254,21 @@ end
-- @tparam table lua_table the table to convert -- @tparam table lua_table the table to convert
-- @treturn string the table in a json format -- @treturn string the table in a json format
function table.json(lua_table) function table.json(lua_table)
if game and game.table_to_json then return game.table_to_json(lua_table) end
local result, done, only_indexs = {}, {}, true local result, done, only_indexs = {}, {}, true
for key,value in ipairs(lua_table) do for key,value in ipairs(lua_table) do
done[key] = true done[key] = true
if type(value) == 'table' then table.insert(result,table.json(value,true)) if type(value) == 'table' then table.insert(result,table.json(value,true))
elseif type(value) == 'string' then table.insert(result,'"'..value..'"') elseif not vlaue then table.insert(result,'null')
elseif type(value) == 'number' then table.insert(result,value) else table.insert(result,table.val_to_str(value))
elseif type(value) == 'boolean' then table.insert(result,tostring(value))
else table.insert(result,'null')
end end
end end
for key,value in pairs(lua_table) do for key,value in pairs(lua_table) do
if not done[key] then if not done[key] then
only_indexs = false only_indexs = false
if type(value) == 'table' then table.insert(result,'"'..key..'":'..table.json(value,true)) if type(value) == 'table' then table.insert(result,table.val_to_str(key)..':'..table.json(value,true))
elseif type(value) == 'string' then table.insert(result,'"'..key..'":"'..value..'"') elseif not value then table.insert(result,table.val_to_str(key)..':null')
elseif type(value) == 'number' then table.insert(result,'"'..key..'":'..value) else table.insert(result,table.val_to_str(key)..':'..table.val_to_str(value))
elseif type(value) == 'boolean' then table.insert(result,'"'..key..'":'..tostring(value))
else table.insert(result,'"'..key..'":null')
end end
end end
end end