(GH-885) Determine Installer by Overridable Method

This allows a more comprehensive check in overrides of the uninstaller service.
chocolatey · Aug 1, 2016 · c181fd2 · c181fd2
1 parent be903e4
commit c181fd2
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs b/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs
@@ -95,25 +95,7 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                 uninstallExe = uninstallExe.remove_surrounding_quotes();
                 this.Log().Debug(() => " Uninstaller path is '{0}'".format_with(uninstallExe));
 
-
-                IInstaller installer = new CustomInstaller();
-
-                switch (key.InstallerType)
-                {
-                    case InstallerType.Msi:
-                        installer = new MsiInstaller();
-                        break;
-                    case InstallerType.InnoSetup:
-                        installer = new InnoSetupInstaller();
-                        break;
-                    case InstallerType.Nsis:
-                        installer = new NsisInstaller();
-                        break;
-                    case InstallerType.InstallShield:
-                        installer = new InstallShieldInstaller();
-                        break;
-                }
-
+                IInstaller installer = get_installer_type(key, uninstallExe, uninstallArgs);
                 this.Log().Debug(() => " Installer type is '{0}'".format_with(installer.GetType().Name));
 
                 if (key.InstallerType == InstallerType.Msi)
@@ -124,7 +106,7 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                     uninstallArgs = uninstallArgs.Replace("/I ", "/X ");
                     uninstallArgs = uninstallArgs.Replace("/i ", "/X ");
                 }
-
+                
                 if (!key.HasQuietUninstall)
                 {
                     //todo: ultimately we should merge keys
@@ -194,5 +176,28 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                 }
             }
         }
+
+        public virtual IInstaller get_installer_type(RegistryApplicationKey key, string uninstallExe, string uninstallArgs)
+        {
+            IInstaller installer = new CustomInstaller();
+
+            switch (key.InstallerType)
+            {
+                case InstallerType.Msi:
+                    installer = new MsiInstaller();
+                    break;
+                case InstallerType.InnoSetup:
+                    installer = new InnoSetupInstaller();
+                    break;
+                case InstallerType.Nsis:
+                    installer = new NsisInstaller();
+                    break;
+                case InstallerType.InstallShield:
+                    installer = new InstallShieldInstaller();
+                    break;
+            }
+
+            return installer;
+        }
     }
 }