addons: fix bug causing setup() to be called twice for internal addons

Author: CogentRedTester

main.lua

@@ -28,8 +28,9 @@ local user_input_loaded, user_input = pcall(require, "user-input-module")
 
 -- root and addon setup
 setup.root()
-addons.load_internal_parsers()
+addons.load_internal_addons()
 if o.addons then addons.load_external_addons() end
+addons.setup_addons()
 
 --these need to be below the addon setup in case any parsers add custom entries
 setup.extensions_list()

modules/addons.lua

@@ -159,6 +159,24 @@ local function load_addons(directory)
     for _, file in ipairs(files) do
         setup_addon(file, directory..file)
     end
+end
+
+local function load_internal_addons()
+    local script_dir = mp.get_script_directory()
+    if not script_dir then return msg.error('script is not being run as a directory script!') end
+    local internal_addon_dir = script_dir..'/modules/parsers/'
+    load_addons(internal_addon_dir)
+end
+
+local function load_external_addons()
+    local addon_dir = mp.command_native({"expand-path", o.addon_directory..'/'}) --[[@as string|nil]]
+    if not addon_dir then return msg.verbose('not loading external addons - could not resolve', o.addon_directory) end
+    load_addons(addon_dir)
+end
+
+---Orders the addons by priority, sets the parser index values,
+---and runs the setup methods of the addons.
+local function setup_addons()
     table.sort(g.parsers, function(a, b) return a.priority < b.priority end)
 
     --we want to store the indexes of the parsers
@@ -176,22 +194,10 @@ local function load_addons(directory)
     end
 end
 
-local function load_internal_parsers()
-    local script_dir = mp.get_script_directory()
-    if not script_dir then return msg.error('script is not being run as a directory script!') end
-    local internal_addon_dir = script_dir..'/modules/parsers/'
-    load_addons(internal_addon_dir)
-end
-
-local function load_external_addons()
-    local addon_dir = mp.command_native({"expand-path", o.addon_directory..'/'}) --[[@as string|nil]]
-    if not addon_dir then return msg.error('could not resolve', o.addon_directory) end
-    load_addons(addon_dir)
-end
-
 ---@class addons
 return {
     check_api_version = check_api_version,
-    load_internal_parsers = load_internal_parsers,
-    load_external_addons = load_external_addons
+    load_internal_addons = load_internal_addons,
+    load_external_addons = load_external_addons,
+    setup_addons = setup_addons,
 }