Version 3.0.8

ModManager/AddonInstallerSystem/AddonInstallerService.cs

@@ -1,44 +1,60 @@
-using Modio.Models;
+using System.Collections.Generic;
 using ModManager.AddonSystem;
+using Timberborn.Modding;
+using Mod = Modio.Models.Mod;
 
 namespace ModManager.AddonInstallerSystem
 {
-    public class AddonInstallerService : Singleton<AddonInstallerService>
+    public class AddonInstallerService
     {
-        private readonly AddonInstallerRegistry _addonInstallerRegistry = AddonInstallerRegistry.Instance;
+        private readonly ModRepository _modRepository;
+
+        private readonly IEnumerable<IAddonInstaller> _addonInstallers;
+
+        public AddonInstallerService(ModRepository modRepository, IEnumerable<IAddonInstaller> addonInstallers)
+        {
+            _modRepository = modRepository;
+            _addonInstallers = addonInstallers;
+        }
 
         public void Install(Mod mod, string zipLocation)
         {
-            foreach (var installer in _addonInstallerRegistry.GetAddonInstallers())
+            foreach (var installer in _addonInstallers)
             {
                 if (installer.Install(mod, zipLocation))
                 {
+                    _modRepository.Load();
+
                     return;
                 }
             }
 
             throw new AddonInstallerException($"{mod.Name} could not be installed by any installer");
         }
 
-        public void Uninstall(Manifest manifest)
+        public void Uninstall(ModManagerManifest modManagerManifest)
         {
-            foreach (var installer in _addonInstallerRegistry.GetAddonInstallers())
+            foreach (var installer in _addonInstallers)
             {
-                if (installer.Uninstall(manifest))
+                if (installer.Uninstall(modManagerManifest))
                 {
+                    _modRepository.Load();
+
                     return;
                 }
             }
 
-            throw new AddonInstallerException($"{manifest.ModName} could not be uninstalled by any installer");
+            throw new AddonInstallerException($"{modManagerManifest.ModName} could not be uninstalled by any installer");
         }
 
-        public void ChangeVersion(Mod mod, File file, string zipLocation)
+        public void ChangeVersion(Mod mod, string zipLocation)
         {
-            foreach (var installer in _addonInstallerRegistry.GetAddonInstallers())
+            foreach (var installer in _addonInstallers)
             {
-                if (installer.ChangeVersion(mod, file, zipLocation))
+                if (installer.ChangeVersion(mod, zipLocation))
                 {
+                    _modRepository.Load();
+
                     return;
                 }
             }

ModManager/AddonInstallerSystem/IAddonInstaller.cs

@@ -7,8 +7,8 @@ public interface IAddonInstaller
     {
         public bool Install(Mod mod, string zipLocation);
 
-        public bool Uninstall(Manifest manifest);
+        public bool Uninstall(ModManagerManifest modManagerManifest);
 
-        public bool ChangeVersion(Mod mod, File file, string zipLocation);
+        public bool ChangeVersion(Mod mod, string zipLocation);
     }
 }