Move archive extraction in content store to async job

4 files changed, 33 insertions, 97 deletions

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index c2452fe00..f5f89acd7 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -532,7 +532,7 @@ if INIT == "mainmenu" then
 	end
 end
 
-if INIT == "client" or INIT == "mainmenu" then
+if core.gettext then -- for client and mainmenu
 	function fgettext_ne(text, ...)
 		text = core.gettext(text)
 		local arg = {n=select('#', ...), ...}
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 6db351048..b36c9596a 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -119,17 +119,9 @@ function render_serverlist_row(spec)
 
 	return table.concat(details, ",")
 end
-
---------------------------------------------------------------------------------
-os.tempfolder = function()
-	local temp = core.get_temp_path()
-	return temp .. DIR_DELIM .. "MT_" .. math.random(0, 10000)
-end
-
+---------------------------------------------------------------------------------
 os.tmpname = function()
-	local path = os.tempfolder()
-	io.open(path, "w"):close()
-	return path
+	error('do not use') -- instead use core.get_temp_path()
 end
 --------------------------------------------------------------------------------
 
diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index a3c72aee4..58421ef75 100644
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -72,34 +72,52 @@ local function get_download_url(package, reason)
 end
 
 
-local function download_package(param)
-	if core.download_file(param.url, param.filename) then
+local function download_and_extract(param)
+	local package = param.package
+
+	local filename = core.get_temp_path(true)
+	if filename == "" or not core.download_file(param.url, filename) then
+		core.log("error", "Downloading " .. dump(param.url) .. " failed")
 		return {
-			filename = param.filename,
-			successful = true,
+			msg = fgettext("Failed to download $1", package.name)
 		}
+	end
+
+	local tempfolder = core.get_temp_path()
+	if tempfolder ~= "" then
+		tempfolder = tempfolder .. DIR_DELIM .. "MT_" .. math.random(1, 1024000)
+		if not core.extract_zip(filename, tempfolder) then
+			tempfolder = nil
+		end
 	else
-		core.log("error", "downloading " .. dump(param.url) .. " failed")
+		tempfolder = nil
+	end
+	os.remove(filename)
+	if not tempfolder then
 		return {
-			successful = false,
+			msg = fgettext("Install: Unsupported file type or broken archive"),
 		}
 	end
+
+	return {
+		path = tempfolder
+	}
 end
 
 local function start_install(package, reason)
 	local params = {
 		package = package,
 		url = get_download_url(package, reason),
-		filename = os.tempfolder() .. "_MODNAME_" .. package.name .. ".zip",
 	}
 
 	number_downloading = number_downloading + 1
 
 	local function callback(result)
-		if result.successful then
-			local path, msg = pkgmgr.install(package.type,
-					result.filename, package.name,
-					package.path)
+		if result.msg then
+			gamedata.errormessage = result.msg
+		else
+			local path, msg = pkgmgr.install_dir(package.type, result.path, package.name, package.path)
+			core.delete_dir(result.path)
 			if not path then
 				gamedata.errormessage = msg
 			else
@@ -137,9 +155,6 @@ local function start_install(package, reason)
 					conf:write()
 				end
 			end
-			os.remove(result.filename)
-		else
-			gamedata.errormessage = fgettext("Failed to download $1", package.name)
 		end
 
 		package.downloading = false
@@ -159,7 +174,7 @@ local function start_install(package, reason)
 	package.queued = false
 	package.downloading = true
 
-	if not core.handle_async(download_package, params, callback) then
+	if not core.handle_async(download_and_extract, params, callback) then
 		core.log("error", "ERROR: async event failed")
 		gamedata.errormessage = fgettext("Failed to download $1", package.name)
 		return
diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index 76d4a4123..d07dc019c 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -181,21 +181,6 @@ function pkgmgr.get_texture_packs()
 end
 
 --------------------------------------------------------------------------------
-function pkgmgr.extract(modfile)
-	if modfile.type == "zip" then
-		local tempfolder = os.tempfolder()
-
-		if tempfolder ~= nil and
-			tempfolder ~= "" then
-			core.create_dir(tempfolder)
-			if core.extract_zip(modfile.name,tempfolder) then
-				return tempfolder
-			end
-		end
-	end
-	return nil
-end
-
 function pkgmgr.get_folder_type(path)
 	local testfile = io.open(path .. DIR_DELIM .. "init.lua","r")
 	if testfile ~= nil then
@@ -658,23 +643,6 @@ function pkgmgr.install_dir(type, path, basename, targetpath)
 end
 
 --------------------------------------------------------------------------------
-function pkgmgr.install(type, modfilename, basename, dest)
-	local archive_info = pkgmgr.identify_filetype(modfilename)
-	local path = pkgmgr.extract(archive_info)
-
-	if path == nil then
-		return nil,
-			fgettext("Install: file: \"$1\"", archive_info.name) .. "\n" ..
-			fgettext("Install: Unsupported file type \"$1\" or broken archive",
-				archive_info.type)
-	end
-
-	local targetpath, msg = pkgmgr.install_dir(type, path, basename, dest)
-	core.delete_dir(path)
-	return targetpath, msg
-end
-
---------------------------------------------------------------------------------
 function pkgmgr.preparemodlist(data)
 	local retval = {}
 
@@ -818,45 +786,6 @@ function pkgmgr.refresh_globals()
 end
 
 --------------------------------------------------------------------------------
-function pkgmgr.identify_filetype(name)
-
-	if name:sub(-3):lower() == "zip" then
-		return {
-				name = name,
-				type = "zip"
-				}
-	end
-
-	if name:sub(-6):lower() == "tar.gz" or
-		name:sub(-3):lower() == "tgz"then
-		return {
-				name = name,
-				type = "tgz"
-				}
-	end
-
-	if name:sub(-6):lower() == "tar.bz2" then
-		return {
-				name = name,
-				type = "tbz"
-				}
-	end
-
-	if name:sub(-2):lower() == "7z" then
-		return {
-				name = name,
-				type = "7z"
-				}
-	end
-
-	return {
-		name = name,
-		type = "ukn"
-	}
-end
-
-
---------------------------------------------------------------------------------
 function pkgmgr.find_by_gameid(gameid)
 	for i=1,#pkgmgr.games,1 do
 		if pkgmgr.games[i].id == gameid then