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

Content store: Use composite key to track installations (#8054)

Browse Source 
Fixes #7967 'Package manager doesn't track content reliably'.
This commit is contained in:
rubenwardy 2019-01-30 16:43:28 +00:00 committed by Paramat
parent d9f5ff42a1
commit 944e9f5acb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/mainmenu/dlg_contentstore.lua
View File

@ -300,6 +300,8 @@ function store.load()
package.url = base_url .. "/packages/" .. package.url = base_url .. "/packages/" ..
package.author .. "/" .. package.name .. package.author .. "/" .. package.name ..
"/releases/" .. package.release .. "/download/" "/releases/" .. package.release .. "/download/"
package.id = package.author .. "/" .. package.name
end end
store.packages = store.packages_full store.packages = store.packages_full
@ -314,7 +316,7 @@ function store.update_paths()
pkgmgr.refresh_globals() pkgmgr.refresh_globals()
for _, mod in pairs(pkgmgr.global_mods:get_list()) do for _, mod in pairs(pkgmgr.global_mods:get_list()) do
if mod.author then if mod.author then
mod_hash[mod.name] = mod mod_hash[mod.author .. "/" .. mod.name] = mod
end end
end end
@ -322,30 +324,30 @@ function store.update_paths()
pkgmgr.update_gamelist() pkgmgr.update_gamelist()
for _, game in pairs(pkgmgr.games) do for _, game in pairs(pkgmgr.games) do
if game.author then if game.author then
game_hash[game.id] = game game_hash[game.author .. "/" .. game.id] = game
end end
end end
local txp_hash = {} local txp_hash = {}
for _, txp in pairs(pkgmgr.get_texture_packs()) do for _, txp in pairs(pkgmgr.get_texture_packs()) do
if txp.author then if txp.author then
txp_hash[txp.name] = txp txp_hash[txp.author .. "/" .. txp.name] = txp
end end
end end
for _, package in pairs(store.packages_full) do for _, package in pairs(store.packages_full) do
local content local content
if package.type == "mod" then if package.type == "mod" then
content = mod_hash[package.name] content = mod_hash[package.id]
elseif package.type == "game" then elseif package.type == "game" then
content = game_hash[package.name] content = game_hash[package.id]
elseif package.type == "txp" then elseif package.type == "txp" then
content = txp_hash[package.name] content = txp_hash[package.id]
end end
if content and content.author == package.author then if content then
package.path = content.path package.path = content.path
package.installed_release = content.release package.installed_release = content.release or 0
else else
package.path = nil package.path = nil
end end