hang onto event handlers in service helper for re-use

added method to coreservice to reload settings and coresservices
mattpannella · May 29, 2024 · 4e0bc1c · 4e0bc1c
1 parent 8097c36
commit 4e0bc1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/helpers/ServiceHelper.cs b/src/helpers/ServiceHelper.cs
@@ -13,6 +13,8 @@ public static class ServiceHelper
     public static FirmwareService FirmwareService { get; private set; }
     public static ArchiveService ArchiveService { get; private set; }
     public static AssetsService AssetsService { get; private set; }
+    public static EventHandler<StatusUpdatedEventArgs> StatusUpdated { get; private set; }
+    public static EventHandler<UpdateProcessCompleteEventArgs> UpdateProcessComplete { get; private set; }
 
     private static bool isInitialized;
 
@@ -40,11 +42,13 @@ public static void Initialize(string path, EventHandler<StatusUpdatedEventArgs>
                 FirmwareService.StatusUpdated += statusUpdated;
                 CoresService.StatusUpdated += statusUpdated;
                 ArchiveService.StatusUpdated += statusUpdated;
+                StatusUpdated = statusUpdated;
             }
 
             if (updateProcessComplete != null)
             {
                 CoresService.UpdateProcessComplete += updateProcessComplete;
+                UpdateProcessComplete = updateProcessComplete;
             }
         }
     }
@@ -56,5 +60,6 @@ public static void ReloadSettings()
         ArchiveService = new ArchiveService(SettingsService.GetConfig().archives,
                 SettingsService.GetConfig().crc_check, SettingsService.GetConfig().use_custom_archive);
         CoresService = new CoresService(UpdateDirectory, SettingsService, ArchiveService, AssetsService);
+        CoresService.StatusUpdated += StatusUpdated;
     }
 }
diff --git a/src/partials/Program.Menus.cs b/src/partials/Program.Menus.cs
@@ -286,6 +286,7 @@ private static void DisplayMenu(CoreUpdaterService coreUpdaterService)
                 SettingsMenu();
                 // Is reloading the settings file necessary?
                 ServiceHelper.ReloadSettings();
+                coreUpdaterService.ReloadSettings();
             })
             .Add("Exit", ConsoleMenu.Close);
 

diff --git a/src/services/CoreUpdaterService.cs b/src/services/CoreUpdaterService.cs
@@ -13,8 +13,8 @@ public class CoreUpdaterService : BaseProcess
     private readonly string installPath;
     private readonly List<Core> cores;
     private readonly FirmwareService firmwareService;
-    private readonly SettingsService settingsService;
-    private readonly CoresService coresService;
+    private SettingsService settingsService;
+    private CoresService coresService;
 
     public CoreUpdaterService(
         string path,
@@ -356,4 +356,10 @@ public void DeleteCore(Core core, bool force = false, bool nuke = false)
             this.coresService.Uninstall(core.identifier, core.platform_id, nuke);
         }
     }
+
+    public void ReloadSettings()
+    {
+        this.settingsService = ServiceHelper.SettingsService;;
+        this.coresService = ServiceHelper.CoresService;
+    }
 }