support zip game

Author: cloudwu

src/lualib/icon.lua

@@ -3,7 +3,7 @@ local datalist = require "soluna.datalist"
 local file = require "soluna.file"
 local mattext = require "soluna.material.text"
 
-global error, tostring
+global error, tostring, print
 
 local icon = {}
 
@@ -16,7 +16,7 @@ function icon.bundle(filename)
 	for i = 1, n do
 		local icon = b[i]
 		names[icon.name] = i - 1
-		local src = file.load(path .. "/" .. icon.image) or error "Open icon fail : " .. tostring(icon.name)
+		local src = file.load(path .. icon.image) or error ("Open icon fail : " .. tostring(icon.name))
 		local img = sdf.load(src)
 		icons[i] = img
 	end

src/lualib/main.lua

@@ -6,8 +6,14 @@ global load, require, assert, select, error, tostring, print
 local init_func_temp = [=[
 	local name, service_path = ...
 	local embedsource = require "soluna.embedsource"
+	local file = require "soluna.file"
 	package.path = [[${lua_path}]]
 	package.cpath = [[${lua_cpath}]]
+	local zipfile = [[${zipfile}]]
+	if zipfile ~= "" then
+		local zip = require "soluna.zip"
+		zip.zipfile = zip.open(zipfile, "r")
+	end
 	_G.print_r = load(embedsource.runtime.print_r(), "@src/lualib/print_r.lua")()
 	local packageloader = load(embedsource.runtime.packageloader(), "@src/lualib/packageloader.lua")
 	packageloader()
@@ -35,11 +41,11 @@ local init_func_temp = [=[
 	if embedcode then
 		return load(embedcode(),"=("..name..")")
 	end
-	local filename, err = package.searchpath(name, service_path or "${service_path}")
+	local filename, err = file.searchpath(name, service_path or "${service_path}")
 	if not filename then
 		return nil, err
 	end
-	return loadfile(filename)
+	return load(file.load(filename), "@"..filename)
 ]=]
 
 local function start(config)
@@ -57,6 +63,7 @@ local function start(config)
 			lua_path = package.path,
 			lua_cpath = package.cpath,
 			service_path = config.service_path or "",
+			zipfile = config.args.zipfile or "",
 		}),
 	}
 
@@ -180,6 +187,15 @@ end
 
 function api.init(desc)
 	-- todo : settings
+	local zipfile = args[1] or args.zipfile or "main.zip"
+	local zip = require "soluna.zip"
+	local f = zip.open(zipfile, "r")
+	if f then
+		zip.zipfile = f
+		args.zipfile = zipfile
+	else
+		args.zipfile = nil
+	end
 	local embedsource = require "soluna.embedsource"
 	local packageloader = load(embedsource.runtime.packageloader(), "@src/lualib/packageloader.lua")
 	packageloader()

src/lualib/packageloader.lua

@@ -1,4 +1,6 @@
 local file = require "soluna.file"
+local zip = require "soluna.zip"
+local lfs = require "soluna.lfs"
 
 local package = package
 local string = string
@@ -9,8 +11,79 @@ global load, print
 local dir_sep, temp_sep, temp_marker = package.config:match "(.)\n(.)\n(.)"
 local temp_pat = "[^"..temp_sep.."]+"
 
+local zipfile = zip.zipfile
+local file_load = file.load
+local file_exist = file.exist
+
+if zipfile then
+	function file_load(fullname)
+		local name = fullname:match "%./(.*)" or fullname
+		return zipfile:readfile(name)
+	end
+	function file_exist(fullname)
+		local name = fullname:match "%./(.*)" or fullname
+		return zipfile:exist(name)
+	end
+	file.local_load = file.load
+	file.local_exist = file.exist
+	file.load = file_load
+	file.exist = file_exist
+	local list
+	function file.dir(root)
+		list = list or zipfile:list()
+		root = root:gsub("[^/]$", "%0/")
+		local iter = 1
+		local n = #list
+		local root_n = #root
+		local last
+		return function()
+			while iter <= n do
+				local t = list[iter]
+				iter = iter + 1
+				if t:sub(1, root_n) == root then
+					local sname = t:sub(root_n+1):match "[^/]+"
+					if sname ~= last then
+						last = sname
+						return sname
+					end
+				end
+			end
+		end
+	end
+	function file.attributes(fullname)
+		list = list or zipfile:list()
+		local pathname = fullname .. "/"
+		local pathn = #pathname
+		for i = 1, #list do
+			local t = list[i]
+			if fullname == t then
+				return "file"
+			elseif t:sub(1, pathn) == pathname then
+				return "directory"
+			end
+		end
+	end
+	function file.searchpath(name, path)
+		local cname = name:gsub("%.", "/")
+		for temp in path:gmatch(temp_pat) do
+			local fullname = temp:gsub(temp_marker, cname)
+			if dir_sep ~= '/' then
+				fullname = fullname:gsub(dir_sep, "/")
+			end
+			if file_exist(fullname) then
+				return fullname
+			end
+		end
+	end
+else
+	file.dir = lfs.dir
+	file.attributes = lfs.attributes
+	file.local_load = file.load
+	file.local_exist = file.exist
+end
+
 local function fileload(name, fullname)
-	local s, err = file.load(fullname)
+	local s, err = file_load(fullname)
 	local f = load(s, "@"..fullname)
 	return f(name, fullname)
 end
@@ -22,7 +95,7 @@ local function search_file(name)
 		if dir_sep ~= '/' then
 			fullname = fullname:gsub(dir_sep, "/")
 		end
-		if file.exist(fullname) then
+		if file_exist(fullname) then
 			return fileload, fullname
 		end
 	end

src/luazip.c

@@ -42,8 +42,6 @@ lcompress(lua_State *L) {
 	// 2...n : (1<<n)x size
 	buf[0] = idx;
 	lua_pushexternalstring(L, buf, len+1, external_free, NULL);
-//	lua_pushlstring(L, buf, len + 1);
-//	free(buf);
 	return 1;
 }
 
@@ -59,8 +57,6 @@ luncompress(lua_State *L) {
 	int r = uncompress(buf, &dsz, (void *)(src + 1), sz - 1);
 	if (r == Z_OK) {
 		lua_pushexternalstring(L, buf, dsz, external_free, NULL);
-//		lua_pushlstring(L, buf, dsz);
-//		free(buf);
 		return 1;
 	}
 	free(buf);
@@ -444,8 +440,6 @@ zipread_readfile(lua_State *L) {
 	}
 
 	lua_pushexternalstring(L, buf, bytes, external_free, NULL);
-//	lua_pushlstring(L, buf, bytes);
-//	free(buf);
 	close_file(L, zf);
 	return 1;
 }
@@ -525,8 +519,6 @@ zipread_read(lua_State *L) {
 		luaL_error(L, "Error: read file");
 	}
 	lua_pushexternalstring(L, buf, bytes, external_free, NULL);
-//	lua_pushlstring(L, (const char *)buf, bytes);
-//	free(buf);
 	return 1;
 }