BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Content store: Fix storage leak by storing screenshots in cache (#8137)

Browse Source
This commit is contained in:
rubenwardy 2019-01-31 16:35:55 +00:00 committed by Paramat
parent 944e9f5acb
commit 572ba83b30
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/mainmenu/dlg_contentstore.lua
View File

@ -19,7 +19,7 @@ local store = {}
local package_dialog = {} local package_dialog = {}
-- Screenshot -- Screenshot
local screenshot_dir = os.tempfolder() local screenshot_dir = core.get_cache_path() .. DIR_DELIM .. "cdb"
assert(core.create_dir(screenshot_dir)) assert(core.create_dir(screenshot_dir))
local screenshot_downloading = {} local screenshot_downloading = {}
local screenshot_downloaded = {} local screenshot_downloaded = {}

1
doc/menu_lua_api.txt
View File

@ -65,6 +65,7 @@ core.get_video_drivers()
^ first element of returned list is guaranteed to be the NULL driver ^ first element of returned list is guaranteed to be the NULL driver
core.get_mapgen_names([include_hidden=false]) -> table of map generator algorithms core.get_mapgen_names([include_hidden=false]) -> table of map generator algorithms
registered in the core (possible in async calls) registered in the core (possible in async calls)
core.get_cache_path() -> path of cache
Formspec: Formspec:
core.update_formspec(formspec) core.update_formspec(formspec)

11
src/script/lua_api/l_mainmenu.cpp
View File

@ -683,6 +683,12 @@ int ModApiMainMenu::l_get_texturepath_share(lua_State *L)
return 1; return 1;
} }
int ModApiMainMenu::l_get_cache_path(lua_State *L)
{
lua_pushstring(L, fs::RemoveRelativePathComponents(porting::path_cache).c_str());
return 1;
}
/******************************************************************************/ /******************************************************************************/
int ModApiMainMenu::l_create_dir(lua_State *L) { int ModApiMainMenu::l_create_dir(lua_State *L) {
const char *path = luaL_checkstring(L, 1); const char *path = luaL_checkstring(L, 1);
@ -855,6 +861,9 @@ bool ModApiMainMenu::mayModifyPath(const std::string &path)
if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "worlds"))) if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "worlds")))
return true; return true;
if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_cache)))
return true;
return false; return false;
} }
@ -1043,6 +1052,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
API_FCT(get_gamepath); API_FCT(get_gamepath);
API_FCT(get_texturepath); API_FCT(get_texturepath);
API_FCT(get_texturepath_share); API_FCT(get_texturepath_share);
API_FCT(get_cache_path);
API_FCT(create_dir); API_FCT(create_dir);
API_FCT(delete_dir); API_FCT(delete_dir);
API_FCT(copy_dir); API_FCT(copy_dir);
@ -1071,6 +1081,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
API_FCT(get_gamepath); API_FCT(get_gamepath);
API_FCT(get_texturepath); API_FCT(get_texturepath);
API_FCT(get_texturepath_share); API_FCT(get_texturepath_share);
API_FCT(get_cache_path);
API_FCT(create_dir); API_FCT(create_dir);
API_FCT(delete_dir); API_FCT(delete_dir);
API_FCT(copy_dir); API_FCT(copy_dir);

2
src/script/lua_api/l_mainmenu.h
View File

@ -120,6 +120,8 @@ private:
static int l_get_texturepath_share(lua_State *L); static int l_get_texturepath_share(lua_State *L);
static int l_get_cache_path(lua_State *L);
static int l_create_dir(lua_State *L); static int l_create_dir(lua_State *L);
static int l_delete_dir(lua_State *L); static int l_delete_dir(lua_State *L);