remove file.loader because lua support external string now

Author: cloudwu

src/file.c

@@ -50,77 +50,12 @@ lfile_load(lua_State *L) {
 	return 1;
 }
 
-struct file_buffer {
-	void *ptr;
-};
-
-static int
-close_buffer(lua_State *L) {
-	struct file_buffer *buf = lua_touserdata(L, 1);
-	free(buf->ptr);
-	buf->ptr = NULL;
-	lua_pushnil(L);
-	lua_setmetatable(L, 1);
-	return 0;
-}
-
-static int
-loader(lua_State *L) {
-	const char *filename = lua_tostring(L, lua_upvalueindex(1));
-	const char *mode = luaL_optstring(L, 2, "rb");
-	FILE *f = fopen_utf8(filename, mode);
-	if (f == NULL)
-		return luaL_error(L, "Can't open %s", filename);
-
-	struct file_buffer * buf = (struct file_buffer *)lua_newuserdatauv(L, sizeof(*buf), 0);
-	buf->ptr = NULL;
-	if (luaL_newmetatable(L, "SOLUNA_LOADER")) {
-		luaL_Reg l[] = {
-			{ "__close", close_buffer },
-			{ "__gc", close_buffer },
-			{ NULL, NULL },
-		};
-		luaL_setfuncs(L, l, 0);
-	}
-	lua_setmetatable(L, -2);
-	
-	fseek(f, 0, SEEK_END);
-	size_t sz = ftell(f);
-	fseek(f, 0, SEEK_SET);
-	
-	buf->ptr = malloc(sz);
-	if (buf->ptr == NULL) {
-		fclose(f);
-		return luaL_error(L, "loader : Out of memory");
-	}
-	size_t rd = fread(buf->ptr, 1, sz, f);
-	fclose(f);
-	if (rd != sz) {
-		free(buf->ptr);
-		buf->ptr = NULL;
-		return luaL_error(L, "Read %s failed", filename);
-	}
-	lua_pushlightuserdata(L, buf->ptr);
-	lua_pushinteger(L, sz);
-	lua_pushvalue(L, -3);
-	return 3;
-}
-
-static int
-lfile_loader(lua_State *L) {
-	lua_settop(L, 1);
-	luaL_checkstring(L, 1);
-	lua_pushcclosure(L, loader, 1);
-	return 1;
-}
-
 int
 luaopen_soluna_file(lua_State *L) {
 	luaL_checkversion(L);
 	luaL_Reg l[] = {
 		{ "exist", lfile_exist },
 		{ "load", lfile_load },
-		{ "loader", lfile_loader },
 		{ NULL, NULL },
 	};
 	luaL_newlib(L, l);

src/lualib/icon.lua

@@ -9,7 +9,7 @@ local icon = {}
 
 function icon.bundle(filename)
 	local path = filename:match "(.*[/\\])[^/\\]+$"
-	local b = datalist.parse(file.loader(filename))
+	local b = datalist.parse(file.load(filename))
 	local names = {}
 	local icons = {}
 	local n = #b

src/lualib/initsetting.lua

@@ -59,8 +59,7 @@ function S.init(args)
 	local default_settings = datalist.parse(source.data.settingdefault)
 	local realname = settings_filename(args[1])
 	if realname then
-		local loader = file.loader(realname)
-		local game_settings = datalist.parse(loader)
+		local game_settings = datalist.parse(file.load(realname))
 		for k,v in pairs(game_settings) do
 			patch(default_settings, k,v)
 		end

src/lualib/layout.lua

@@ -128,7 +128,7 @@ do
 	function layout.load(filename_or_list, scripts)
 		local list
 		if type(filename_or_list) == "string" then
-			list = datalist.parse_list(file.loader(filename_or_list))
+			list = datalist.parse_list(file.load(filename_or_list))
 		else
 			list = filename_or_list
 		end

src/lualib/spritebundle.lua

@@ -7,7 +7,7 @@ global type, tonumber, error, assert, ipairs, print
 local M = {}
 
 local function load_bundle(filename)
-	local b = datalist.parse(file.loader(filename))
+	local b = datalist.parse(file.load(filename))
 	return b
 end
 

test/file.lua

@@ -2,9 +2,7 @@ local file = require "soluna.file"
 local image = require "soluna.image"
 local lfs = require "soluna.lfs"
 
-local loader = file.loader "asset/avatar.png"
-
-print_r(image.info(loader))
+print_r(image.info(file.load "asset/avatar.png"))
 print(lfs.realpath ".")
 
 for name in lfs.dir "." do

test/image.lua

@@ -1,7 +1,7 @@
 local image = require "soluna.image"
 local file = require "soluna.file"
 
-local c = file.loader "asset/avatar.png"
+local c = file.load "asset/avatar.png"
 print(image.info(c))
 local content, w, h = image.load(c)
 local x, y, cw, ch = image.crop(content, w, h)