plop

git-svn-id: http://svn.net-core.org/repos/t-engine4@1474 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Module.lua

@@ -77,7 +77,7 @@ end
 
 function _M:createModule(short_name)
 	local dir = "/modules/"..short_name
---	print("Creating module", short_name, ":: (as dir)", fs.exists(dir.."/init.lua"), ":: (as team)", short_name:find(".team$"), "")
+	print("Creating module", short_name, ":: (as dir)", fs.exists(dir.."/init.lua"), ":: (as team)", short_name:find(".team$"), "")
 	if fs.exists(dir.."/init.lua") then
 		local mod = self:loadDefinition(dir)
 		if mod and mod.short_name then

game/engines/default/engine/dialogs/DownloadDialog.lua

@@ -78,7 +78,7 @@ function _M:startDownload()
 		local ltn12 = require "ltn12"
 
 		local size = 0
-		http.TIMEOUT = 10
+		http.TIMEOUT = 1200
 		http.request{url = src, sink = function(chunk, err)
 			if err then
 				l:send(0, "received", {error=err})

game/engines/default/modules/boot/dialogs/UpdateAll.lua

@@ -123,42 +123,39 @@ function _M:updateAll()
 
 		if next.eng then
 			local eversion = next.eng
+
 			-- Download engine
-			local url = ("http://te4.org/dl/engines/%s-%d_%d.%d.%d.teae"):format(eversion[4], eversion[5] or 5, eversion[1], eversion[2], eversion[3])
-			local d = DownloadDialog.new(("Downloading engine: %s"):format(next.name), url, function(di, data)
-				fs.mkdir("/tmp-dl/engines")
-				local fname = ("/tmp-dl/engines/%s-%d_%d.%d.%d.teae"):format(eversion[4], eversion[5] or 5, eversion[1], eversion[2], eversion[3])
+			fs.mkdir("/tmp-dl/engines")
+			local fname = ("/tmp-dl/engines/%s-%d.%d.%d.teae"):format(eversion[4], eversion[1], eversion[2], eversion[3])
+			local f = fs.open(fname, "w")
+
+			local url = ("http://te4.org/dl/engines/%s-%d.%d.%d.teae"):format(eversion[4], eversion[1], eversion[2], eversion[3])
+			local d = DownloadDialog.new(("Downloading engine: %s"):format(next.name), url, function(chunk)
+				f:write(chunk)
+			end, function(di, data)
+				f:close()
 				files[#files+1] = fname
+
+				-- Download engine
+				fs.mkdir("/tmp-dl/modules")
+				local fname = ("/tmp-dl/modules/boot-%s-%d.%d.%d.team"):format(eversion[4], eversion[1], eversion[2], eversion[3])
 				local f = fs.open(fname, "w")
-				for i, v in ipairs(data) do f:write(v) end
-				f:close()
 
-				-- Download boot module
-				local url = ("http://te4.org/dl/engines/boot-%s-%d_%d.%d.%d.team"):format(eversion[4], eversion[5] or 5, eversion[1], eversion[2], eversion[3])
-				local d = DownloadDialog.new(("Downloading engine boot menu: %s"):format(next.name), url, function(di, data)
-					fs.mkdir("/tmp-dl/modules")
-					local fname = ("/tmp-dl/modules/boot.team"):format(eversion[4], eversion[5] or 5, eversion[1], eversion[2], eversion[3])
-					files[#files+1] = fname
-					local f = fs.open(fname, "w")
-					for i, v in ipairs(data) do f:write(v) end
+				local url = ("http://te4.org/dl/engines/boot-%s-%d.%d.%d.team"):format(eversion[4], eversion[1], eversion[2], eversion[3])
+				local d = DownloadDialog.new(("Downloading engine boot menu: %s"):format(next.name), url, function(chunk)
+					f:write(chunk)
+				end, function(di, data)
 					f:close()
-
+					files[#files+1] = fname
 					do_next()
+				end, function(error)
+					Dialog:simplePopup("Error!", "There was an error while downloading:\n"..error)
+					game:unregisterDialog(self)
 				end)
+
 				game:registerDialog(d)
 				d:startDownload()
-			end)
-
-			fs.mkdir("/tmp-dl/engines")
-			local fname = ("/tmp-dl/engines/%s-%d_%d.%d.%d.teae"):format(eversion[4], eversion[5] or 5, eversion[1], eversion[2], eversion[3])
-			local f = fs.open(fname, "w")
 
-			local d = DownloadDialog.new(("Downloading engine: %s"):format(next.name), url, function(chunk)
-				f:write(chunk)
-			end, function(di, data)
-				f:close()
-				files[#files+1] = fname
-				do_next()
 			end, function(error)
 				Dialog:simplePopup("Error!", "There was an error while downloading:\n"..error)
 				game:unregisterDialog(self)

game/engines/default/modules/boot/init.lua

@@ -23,7 +23,7 @@ short_name = "boot"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/"
 is_boot = true
-version = {1,0,0}
+version = {0,9,13}
 engine = {0,9,13,"te4"}
 description = [[
 Bootmenu!

game/loader/init.lua

@@ -55,7 +55,7 @@ local load load = function(...)
 			local ff, err = loadfile("/engines/"..f.."/engine/version.lua")
 			if ff and not err then tryLoadEngine(ff, "/engines/"..f.."/", nil) end
 		else
-			local _, _, name, cv, vM, vm, vp = f:find("^([a-z0-9-]+)%-(%d+)_(%d+)%.(%d+)%.(%d+).teae$")
+			local _, _, name, vM, vm, vp = f:find("^([a-z0-9-]+)%-(%d+)%.(%d+)%.(%d+).teae$")
 			if name then
 				local eng_path = fs.getRealPath("/engines/"..f)
 				fs.mount(eng_path, "/tmp")