Skip to content

Commit ef7986a

Browse files
Apply suggestions from code review
Co-authored-by: SilasD <silas.dunsmore@gmail.com>
1 parent fbb2ae0 commit ef7986a

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

gui/mod-manager.lua

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,14 @@ local function move_mod_entry(viewscreen, to, from, mod_id, mod_version)
115115
return true, loaded_version
116116
end
117117

118-
--- @return { success: boolean, version: string }
118+
---@return boolean # true if the mod entry was moved; false if the mod or mod version was not found.
119+
---@return version # string - DISPLAYED_VERSION from the mod's info.txt
119120
local function enable_mod(viewscreen, mod_id, mod_version)
120121
return move_mod_entry(viewscreen, "object_load_order", "available", mod_id, mod_version)
121122
end
122123

123-
--- @return { success: boolean, version: string }
124+
---@return boolean # returns true if the mod entry was moved; returns false if the mod or mod version was not found.
125+
---@return version # string - DISPLAYED_VERSION from the mod's info.txt
124126
local function disable_mod(viewscreen, mod_id, mod_version)
125127
return move_mod_entry(viewscreen, "available", "object_load_order", mod_id, mod_version)
126128
end
@@ -146,11 +148,11 @@ local function swap_modlist(viewscreen, modlist)
146148
local failures = {}
147149
local changed = {}
148150
for _, v in ipairs(modlist) do
149-
local res = enable_mod(viewscreen, v.id, v.version)
150-
if not res.success then
151+
local success, version = enable_mod(viewscreen, v.id, v.version)
152+
if not success then
151153
table.insert(failures, v.id)
152-
elseif res.version then
153-
table.insert(changed, { id= v.id, new= res.version })
154+
elseif version then
155+
table.insert(changed, { id= v.id, new= version })
154156
end
155157
end
156158
return failures, changed
@@ -245,7 +247,6 @@ local function load_preset(idx, unset_default_on_failure)
245247
local viewscreen = get_any_moddable_viewscreen()
246248
local modlist = presets_file.data[idx].modlist
247249
local failures, changed = swap_modlist(viewscreen, modlist)
248-
local failures = results.failures
249250
local text = {}
250251

251252
local failed = #failures > 0

0 commit comments

Comments
 (0)