Clean up old files within installers

Author: ReplicaObscura

Lib/Launchpad/Installer/DependencyInstaller.ahk

@@ -2,25 +2,22 @@ class DependencyInstaller extends InstallerBase {
     name := "Dependency Installer"
 
     __New(version, appState, cache, extraComponents := "", tmpDir := "") {
+        ; TODO: Remove dependency on A_ScriptDir
+        installDir := A_ScriptDir
         components := []
-        dbVersion := "1.0.2"
+        cleanupFiles := []
 
         ahkUrl := "https://www.autohotkey.com/download/2.0/AutoHotkey_" . A_AhkVersion . ".zip"
         components.Push(DownloadableInstallerComponent(A_AhkVersion, ahkUrl, true, "Vendor\AutoHotKey", appState, "AutoHotKey", cache, "Dependencies", true, tmpDir, false))
-
-        ;mpressUrl := "https://github.com/bmcclure/launcher-db/releases/download/" . dbVersion . "/mpress.exe"
-        ;mpressPath := "Vendor\AutoHotKey\Compiler\mpress.exe"
-        ;mpressComponent := DownloadableInstallerComponent(dbVersion, mpressUrl, false, mpressPath, appState, "Mpress", cache, "AutoHotKey", true, tmpDir, false)
-        ;components.Push(mpressComponent)
-
-        ;ahk2ExeUrl := "https://github.com/bmcclure/launcher-db/releases/download/" . dbVersion . "/Ahk2Exe.exe"
-        ;ahk2ExePath := "Vendor\AutoHotKey\Compiler\Ahk2Exe.exe"
-        ;ahk2ExeComponent := DownloadableInstallerComponent(dbVersion, ahk2ExeUrl, false, ahk2ExePath, appState, "Ahk2Exe", cache, "AutoHotKey", true, tmpDir, false)
-        ;components.Push(ahk2ExeComponent)
-
-        ; TODO: Remove dependency on A_ScriptDir
-        ahkBins := A_ScriptDir . "\Resources\Dependencies\AHkBins.zip"
-        dest := A_ScriptDir . "\Vendor\AutoHotKey\Compiler"
+        
+        ahkDir := installDir . "\Vendor\AutoHotKey"
+        cleanupFiles.Push(ahkDir . "\AutoHotKeyU32.exe")
+        cleanupFiles.Push(ahkDir . "\AutoHotKeyU64.exe")
+        cleanupFiles.Push(ahkDir . "\Compiler\Unicode 32-bit.bin")
+        cleanupFiles.Push(ahkDir . "\Compiler\Unicode 64-bit.bin")
+
+        ahkBins := installDir . "\Resources\Dependencies\AHkBins.zip"
+        dest := ahkDir . "\Compiler"
         ahkBinsComponent := CopyableInstallerComponent(A_AhkVersion, ahkBins, true, dest, appState, "AhkBins", cache, "Dependencies", true, tmpDir, false, "Ahk2Exe.exe")
         components.Push(ahkBinsComponent)
 
@@ -38,6 +35,6 @@ class DependencyInstaller extends InstallerBase {
             }
         }
 
-        super.__New(version, appState, "Dependencies", cache, components, tmpDir := "")
+        super.__New(version, appState, "Dependencies", cache, components, tmpDir, cleanupFiles)
     }
 }

Lib/Shared/AppLib/Installer/InstallerBase.ahk

@@ -13,7 +13,7 @@ class InstallerBase {
     tmpDir := ""
     parentComponent := ""
 
-    __New(version, appState, stateKey, cache, components := "", tmpDir := "") {
+    __New(version, appState, stateKey, cache, components := "", tmpDir := "", cleanupFiles := "") {
         this.cache := cache
         this.version := version
         this.appState := appState
@@ -22,6 +22,12 @@ class InstallerBase {
         this.scriptFile := scriptFile
         this.scriptDir := scriptDir
 
+        if (Type(cleanupFiles) != "Array") {
+            cleanupFiles := [cleanupFiles]
+        }
+
+        this.cleanupFiles := cleanupFiles
+
         if (tmpDir == "") {
             tmpDir := A_Temp . "\Launchpad\Installers"
         }
@@ -85,6 +91,12 @@ class InstallerBase {
             }
         }
 
+        for index, cleanupFile in this.cleanupFiles {
+            if (FileExist(cleanupFile)) {
+                FileDelete(cleanupFile)
+            }
+        }
+
         this.appState.SetComponentInstalled(this.stateKey, success)
 
         return success

Lib/Shared/AppLib/Installer/InstallerComponent/InstallerComponentBase.ahk

@@ -53,6 +53,10 @@ class InstallerComponentBase {
         throw MethodNotImplementedException("InstallerComponentBase", "UninstallAction")
     }
 
+    CleanupPreviousVersionsAction() {
+        return true ; Cleanup is optional
+    }
+
     /**
     * IMPLEMENTED METHODS
     */
@@ -72,13 +76,23 @@ class InstallerComponentBase {
             return true
         }
 
+        this.CleanupPreviousVersionsAction()
         this.InstallAction()
 
         this.appState.SetVersion(this.stateKey, this.version)
         this.appState.SetComponentInstalled(this.stateKey, true)
         return true
     }
 
+    CleanupPreviousVersions() {
+        if (this.onlyCompiled && !A_IsCompiled) {
+            return true
+        }
+
+        this.CleanupPreviousVersionsAction()
+        return true
+    }
+
     Uninstall() {
         if (this.onlyCompiled && !A_IsCompiled) {
             return true