Skip to content
Permalink
Browse files

Cleanup global namespace pollution in builtin (#9451)

  • Loading branch information
Wuzzy2 committed Mar 6, 2020
1 parent 9ca0b37 commit ce8cdc03337ac20b998620f2690eb76e5434ffb9
Showing with 57 additions and 71 deletions.
  1. +1 −71 builtin/common/misc_helpers.lua
  2. +56 −0 builtin/mainmenu/pkgmgr.lua
@@ -5,7 +5,7 @@
local string_sub, string_find = string.sub, string.find

--------------------------------------------------------------------------------
function basic_dump(o)
local function basic_dump(o)
local tp = type(o)
if tp == "number" then
return tostring(o)
@@ -200,18 +200,6 @@ function table.indexof(list, val)
return -1
end

--------------------------------------------------------------------------------
if INIT ~= "client" then
function file_exists(filename)
local f = io.open(filename, "r")
if f == nil then
return false
else
f:close()
return true
end
end
end
--------------------------------------------------------------------------------
function string:trim()
return (self:gsub("^%s*(.-)%s*$", "%1"))
@@ -254,64 +242,6 @@ function math.factorial(x)
return v
end

--------------------------------------------------------------------------------
function get_last_folder(text,count)
local parts = text:split(DIR_DELIM)

if count == nil then
return parts[#parts]
end

local retval = ""
for i=1,count,1 do
retval = retval .. parts[#parts - (count-i)] .. DIR_DELIM
end

return retval
end

--------------------------------------------------------------------------------
function cleanup_path(temppath)

local parts = temppath:split("-")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath .. "_"
end
temppath = temppath .. parts[i]
end

parts = temppath:split(".")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath .. "_"
end
temppath = temppath .. parts[i]
end

parts = temppath:split("'")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath .. ""
end
temppath = temppath .. parts[i]
end

parts = temppath:split(" ")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath
end
temppath = temppath .. parts[i]
end

return temppath
end

function core.formspec_escape(text)
if text ~= nil then
text = string.gsub(text,"\\","\\\\")
@@ -16,6 +16,62 @@
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

--------------------------------------------------------------------------------
local function get_last_folder(text,count)
local parts = text:split(DIR_DELIM)

if count == nil then
return parts[#parts]
end

local retval = ""
for i=1,count,1 do
retval = retval .. parts[#parts - (count-i)] .. DIR_DELIM
end

return retval
end

local function cleanup_path(temppath)

local parts = temppath:split("-")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath .. "_"
end
temppath = temppath .. parts[i]
end

parts = temppath:split(".")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath .. "_"
end
temppath = temppath .. parts[i]
end

parts = temppath:split("'")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath .. ""
end
temppath = temppath .. parts[i]
end

parts = temppath:split(" ")
temppath = ""
for i=1,#parts,1 do
if temppath ~= "" then
temppath = temppath
end
temppath = temppath .. parts[i]
end

return temppath
end

function get_mods(path,retval,modpack)
local mods = core.get_dir_list(path, true)

0 comments on commit ce8cdc0

Please sign in to comment.
You can’t perform that action at this time.