Got new install process working better

ReplicaObscura · ReplicaObscura · commit 97b75ba78633 · 2020-12-03T17:29:02.000-05:00
diff --git a/Launchpad.ahk b/Launchpad.ahk
@@ -5,7 +5,10 @@ A_IconHidden := A_IsCompiled
 #Include Lib\Shared\Includes.ahk
 #Include Lib\Launchpad\Includes.ahk
 
-TraySetIcon("Graphics\Launchpad.ico")
+if (FileExist("Graphics\Launchpad.ico")) {
+    TraySetIcon("Graphics\Launchpad.ico")
+}
+
 
 SplitPath(A_ScriptName,,,, appName)
 
@@ -16,7 +19,8 @@ try {
     app.Windows.OpenMainWindow()
 } catch e {
     extra := (e.HasProp("Extra") and e.Extra != "") ? "`n`nAdditional info:`n" . e.Extra : ""
-    MsgBox "An unhandled exception has occurred in " . e.What . ".`n`n" . e.Message . extra . "`n`nLaunchpad will now exit."
+    occurredIn := e.What ? " in " . e.What : ""
+    MsgBox "An unhandled exception has occurred" . occurredIn . ".`n`n" . e.Message . extra . "`n`nDebugging Information:`nFile: " . e.File . "`nLine: " . e.Line . "`n`nLaunchpad will now exit."
     ExitApp
 }
 
diff --git a/Lib/Launchpad/BulkOperation/InstallOp.ahk b/Lib/Launchpad/BulkOperation/InstallOp.ahk
@@ -33,7 +33,7 @@ class InstallOp extends BulkOperationBase {
 
         for index, installerKey in this.installerKeys {
             installer := this.app.Installers.GetInstaller(installerKey)
-            count += installer.CountAssets()
+            count += installer.CountComponents()
         }
 
         return count
diff --git a/Lib/Launchpad/Installer/DependencyInstaller.ahk b/Lib/Launchpad/Installer/DependencyInstaller.ahk
@@ -2,45 +2,45 @@ class DependencyInstaller extends InstallerBase {
     name := "Launchpad Dependency Installer"
     version := "latest"
 
-    __New(appState, cache, extraAssets := "", tmpDir := "") {
-        assets := []
+    __New(appState, cache, extraComponents := "", tmpDir := "") {
+        components := []
 
         dbVersion := "1.0.2"
 
         ahkUrl := "https://www.autohotkey.com/download/2.0/AutoHotkey_" . A_AhkVersion . ".zip"
         ahkPath := "Vendor\AutoHotKey"
-        ahkAsset := DownloadableInstallerAsset.new(ahkUrl, true, ahkPath, appState, "AutoHotKey", cache, "Dependencies", true, tmpDir, false)
-        ahkAsset.version := A_AhkVersion
-        assets.Push(ahkAsset)
+        ahkComponent := DownloadableInstallerComponent.new(ahkUrl, true, ahkPath, appState, "AutoHotKey", cache, "Dependencies", true, tmpDir, false)
+        ahkComponent.version := A_AhkVersion
+        components.Push(ahkComponent)
 
         mpressUrl := "https://github.com/bmcclure/launcher-db/releases/download/" . dbVersion . "/mpress.exe"
         mpressPath := "Vendor\AutoHotKey\Compiler\mpress.exe"
-        mpressAsset := DownloadableInstallerAsset.new(mpressUrl, false, mpressPath, appState, "Mpress", cache, "AutoHotKey", true, tmpDir, false)
-        mpressAsset.version := dbVersion
-        assets.Push(mpressAsset)
+        mpressComponent := DownloadableInstallerComponent.new(mpressUrl, false, mpressPath, appState, "Mpress", cache, "AutoHotKey", true, tmpDir, false)
+        mpressComponent.version := dbVersion
+        components.Push(mpressComponent)
 
         ahk2ExeUrl := "https://github.com/bmcclure/launcher-db/releases/download/" . dbVersion . "/Ahk2Exe.exe"
         ahk2ExePath := "Vendor\AutoHotKey\Compiler\Ahk2Exe.exe"
-        ahk2ExeAsset := DownloadableInstallerAsset.new(ahk2ExeUrl, false, ahk2ExePath, appState, "Ahk2Exe", cache, "AutoHotKey", true, tmpDir, false)
-        ahk2ExeAsset.version := dbVersion
-        assets.Push(ahk2ExeAsset)
+        ahk2ExeComponent := DownloadableInstallerComponent.new(ahk2ExeUrl, false, ahk2ExePath, appState, "Ahk2Exe", cache, "AutoHotKey", true, tmpDir, false)
+        ahk2ExeComponent.version := dbVersion
+        components.Push(ahk2ExeComponent)
 
-        assets.Push(GitHubReleaseInstallerAsset.new("dafzor/bnetlauncher", "", true, "Vendor\BnetLauncher", appState, "BnetLauncher", cache, "Dependencies", true, tmpDir, false))
+        components.Push(GitHubReleaseInstallerComponent.new("dafzor/bnetlauncher", "", true, "Vendor\BnetLauncher", appState, "BnetLauncher", cache, "Dependencies", true, tmpDir, false))
 
-        assetUrl := "https://benmcclure.com/launcher-db/Assets/Dependencies/BnetLauncher/gamedb.ini"
-        assetPath := "Vendor\BnetLauncher\gamedb.ini"
-        assets.Push(DownloadableInstallerAsset.new(assetUrl, false, assetPath, appState, "GameDbIni", cache, "BnetLauncher", true, tmpDir, false))
+        componentUrl := "https://benmcclure.com/launcher-db/Components/Dependencies/BnetLauncher/gamedb.ini"
+        componentPath := "Vendor\BnetLauncher\gamedb.ini"
+        components.Push(DownloadableInstallerComponent.new(componentUrl, false, componentPath, appState, "GameDbIni", cache, "BnetLauncher", true, tmpDir, false))
 
         iconsExtUrl := "https://www.nirsoft.net/utils/iconsext.zip"
         iconsExtPath := "Vendor\IconsExt"
-        assets.Push(DownloadableInstallerAsset.new(iconsExtUrl, true, iconsExtPath, appState, "IconsExt", cache, "Dependencies", false, tmpDir, false))
+        components.Push(DownloadableInstallerComponent.new(iconsExtUrl, true, iconsExtPath, appState, "IconsExt", cache, "Dependencies", false, tmpDir, false))
 
-        if (extraAssets != "") {
-            for (index, asset in extraAssets) {
-                assets.Push(asset)
+        if (extraComponents != "") {
+            for (index, component in extraComponents) {
+                components.Push(component)
             }
         }
 
-        super.__New(appState, "Dependencies", cache, assets, tmpDir := "")
+        super.__New(appState, "Dependencies", cache, components, tmpDir := "")
     }
 }
diff --git a/Lib/Launchpad/Installer/LaunchpadExeInstaller.ahk b/Lib/Launchpad/Installer/LaunchpadExeInstaller.ahk
@@ -8,15 +8,15 @@ class LaunchpadExeInstaller extends InstallerBase {
         SplitPath(A_ScriptFullPath,,,,scriptNameNoExt)
         this.isUpdater := scriptNameNoExt == this.appName . "Updater"
 
-        assets := []
+        components := []
 
         if (this.isUpdater) {
-            asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", this.appName . ".exe", false, "", appState, "LaunchpadExe", cache, this.appName, true, tmpDir, true)
-            asset.version := this.version
-            assets.Push(asset)
+            component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", this.appName . ".exe", false, "", appState, "LaunchpadExe", cache, this.appName, true, tmpDir, true)
+            component.version := this.version
+            components.Push(component)
         }
 
-        super.__New(appState, "LaunchpadExeInstaller", cache, assets, tmpDir)
+        super.__New(appState, "LaunchpadExeInstaller", cache, components, tmpDir)
     }
 
     Install(progress := "") {
@@ -29,8 +29,8 @@ class LaunchpadExeInstaller extends InstallerBase {
                 this.movedApp := true
                 this.scriptDir := installDir
 
-                for (index, asset in this.installerAssets) {
-                    asset.scriptDir := installDir
+                for (index, component in this.installerComponents) {
+                    component.scriptDir := installDir
                 }
             }
         }
diff --git a/Lib/Launchpad/Installer/LaunchpadInstaller.ahk b/Lib/Launchpad/Installer/LaunchpadInstaller.ahk
@@ -4,16 +4,16 @@ class LaunchpadInstaller extends InstallerBase {
     version := "latest"
 
     __New(appState, cache, tmpDir := "") {
-        assets := []
+        components := []
 
-        asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", "LaunchpadUpdater.exe", true, "", appState, "LaunchpadUpdater", cache, this.appName, true, tmpDir, true)
-        asset.version := this.version
-        assets.Push(asset)
+        component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", "LaunchpadUpdater.exe", false, "LaunchpadUpdater.exe", appState, "LaunchpadUpdater", cache, this.appName, true, tmpDir, true)
+        component.version := this.version
+        components.Push(component)
 
-        asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", "LaunchpadGraphics.zip", true, "Graphics", appState, "LaunchpadGraphics", cache, this.appName, true, tmpDir, true)
-        asset.version := this.version
-        assets.Push(asset)
+        component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", "LaunchpadGraphics.zip", true, "Graphics", appState, "LaunchpadGraphics", cache, this.appName, true, tmpDir, true)
+        component.version := this.version
+        components.Push(component)
 
-        super.__New(appState, this.appName, cache, assets, tmpDir)
+        super.__New(appState, this.appName, cache, components, tmpDir)
     }
 }
diff --git a/Lib/Launchpad/Installer/LibraryInstaller.ahk b/Lib/Launchpad/Installer/LibraryInstaller.ahk
@@ -4,10 +4,10 @@ class LibraryInstaller extends InstallerBase {
     version := "latest"
 
     __New(appState, cache, tmpDir := "") {
-        assets := []
-        asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", "LaunchpadLib.zip", true, "Lib", appState, "LibDirs", cache, "Libraries", true, tmpDir, true)
-        asset.version := this.version
-        assets.Push(asset)
-        super.__New(appState, "Libraries", cache, assets, tmpDir)
+        components := []
+        component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", "LaunchpadLib.zip", true, "Lib", appState, "LibDirs", cache, "Libraries", true, tmpDir, true)
+        component.version := this.version
+        components.Push(component)
+        super.__New(appState, "Libraries", cache, components, tmpDir)
     }
 }
diff --git a/Lib/Launchpad/Installer/ThemeInstaller.ahk b/Lib/Launchpad/Installer/ThemeInstaller.ahk
@@ -3,19 +3,19 @@ class ThemeInstaller extends InstallerBase {
     version := "latest"
 
     __New(appState, cache, downloadThemes := "", tmpDir := "") {
-        assets := []
+        components := []
 
-        asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", "LaunchpadThemes.zip", true, "Themes", appState, "LaunchpadThemes", cache, "Themes", true, tmpDir, true)
-        asset.version := this.version
-        assets.Push(asset)
+        component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", "LaunchpadThemes.zip", true, "Themes", appState, "LaunchpadThemes", cache, "Themes", true, tmpDir, true)
+        component.version := this.version
+        components.Push(component)
 
         if (downloadThemes != "") {
             for key, url in downloadThemes {
                 path := "Themes\" . key . ".json"
-                assets.Push(DownloadableInstallerAsset.new(url, false, path, appState, cache, key . "Theme", "Themes", false, tmpDir, false))
+                components.Push(DownloadableInstallerComponent.new(url, false, path, appState, cache, key . "Theme", "Themes", false, tmpDir, false))
             }
         }
 
-        super.__New(appState, "Themes", cache, assets, tmpDir)
+        super.__New(appState, "Themes", cache, components, tmpDir)
     }
 }
diff --git a/Lib/Launchpad/Service/InstallerManager.ahk b/Lib/Launchpad/Service/InstallerManager.ahk
@@ -3,15 +3,15 @@ class InstallerManager extends ServiceBase {
 
     SetupInstallers() {
         extraThemes := Map()
-        extraDependencyAssets := []
+        extraDependencyComponents := []
 
         tmpDir := this.app.tmpDir . "\Installers"
         cache := this.app.Cache.GetCache("file")
         this.SetInstaller("LaunchpadExe", LaunchpadExeInstaller.new(this.app.AppState, cache, tmpDir))
         this.SetInstaller("Launchpad", LaunchpadInstaller.new(this.app.AppState, cache, tmpDir))
         this.SetInstaller("Libraries", LibraryInstaller.new(this.app.AppState, cache, tmpDir))
         this.SetInstaller("Themes", ThemeInstaller.new(this.app.AppState, cache, extraThemes, tmpDir))
-        this.SetInstaller("Dependencies", DependencyInstaller.new(this.app.AppState, cache, extraDependencyAssets, tmpDir))
+        this.SetInstaller("Dependencies", DependencyInstaller.new(this.app.AppState, cache, extraDependencyComponents, tmpDir))
     }
 
     GetInstaller(key) {
diff --git a/Lib/Launchpad/Service/ThemeManager.ahk b/Lib/Launchpad/Service/ThemeManager.ahk
@@ -50,12 +50,10 @@ class ThemeManager extends ServiceBase {
 
         themeObj := ""
 
-        if (this.themes.Has(key)) {
-            if (!this.ThemeIsLoaded(key)) {
-                themeObj := this.LoadTheme(key)
-            } else {
-                themeObj := this.themes[key]
-            }
+        if (!this.ThemeIsLoaded(key)) {
+            themeObj := this.LoadTheme(key)
+        } else {
+            themeObj := this.themes[key]
         }
 
         return themeObj
diff --git a/Lib/Shared/Includes.ahk b/Lib/Shared/Includes.ahk
@@ -20,11 +20,11 @@
 #Include E:\Tools\Launchpad\Lib\Shared\HttpReq\HttpReqBase.ahk
 #Include E:\Tools\Launchpad\Lib\Shared\HttpReq\WinHttpReq.ahk
 #Include E:\Tools\Launchpad\Lib\Shared\Installer\InstallerBase.ahk
-#Include E:\Tools\Launchpad\Lib\Shared\InstallerAsset\DownloadableInstallerAsset.ahk
-#Include E:\Tools\Launchpad\Lib\Shared\InstallerAsset\FileInstallerAssetBase.ahk
-#Include E:\Tools\Launchpad\Lib\Shared\InstallerAsset\GitHubReleaseInstallerAsset.ahk
-#Include E:\Tools\Launchpad\Lib\Shared\InstallerAsset\InstallerAssetBase.ahk
-#Include E:\Tools\Launchpad\Lib\Shared\InstallerAsset\LibInstallerAsset.ahk
+#Include E:\Tools\Launchpad\Lib\Shared\InstallerComponent\DownloadableInstallerComponent.ahk
+#Include E:\Tools\Launchpad\Lib\Shared\InstallerComponent\FileInstallerComponentBase.ahk
+#Include E:\Tools\Launchpad\Lib\Shared\InstallerComponent\GitHubReleaseInstallerComponent.ahk
+#Include E:\Tools\Launchpad\Lib\Shared\InstallerComponent\InstallerComponentBase.ahk
+#Include E:\Tools\Launchpad\Lib\Shared\InstallerComponent\LibInstallerComponent.ahk
 #Include E:\Tools\Launchpad\Lib\Shared\Json\Json.ahk
 #Include E:\Tools\Launchpad\Lib\Shared\Notifier\NotifierBase.ahk
 #Include E:\Tools\Launchpad\Lib\Shared\Notifier\ToastNotifier.ahk
diff --git a/Lib/Shared/Installer/InstallerBase.ahk b/Lib/Shared/Installer/InstallerBase.ahk
@@ -6,13 +6,13 @@ class InstallerBase {
     onlyInstallWhenCompiled := false
     appState := ""
     stateKey := ""
-    installerAssets := []
+    installerComponents := []
     scriptFile := ""
     scriptDir := ""
     tmpDir := ""
     parentComponent := ""
 
-    __New(appState, stateKey, cache, assets := "", tmpDir := "") {
+    __New(appState, stateKey, cache, components := "", tmpDir := "") {
         this.cache := cache
         this.appState := appState
         this.stateKey := stateKey
@@ -26,22 +26,22 @@ class InstallerBase {
 
         this.tmpDir := tmpDir
 
-        if (assets != "") {
-            this.addAssets(assets)
+        if (components != "") {
+            this.addComponents(components)
         }
     }
 
     /**
     * IMPLEMENTED METHODS
     */
 
-    AddAssets(assets) {
-        if (Type(assets) != "Array") {
-            assets := [assets]
+    AddComponents(components) {
+        if (Type(components) != "Array") {
+            components := [components]
         }
 
-        for index, asset in assets {
-            this.installerAssets.push(asset)
+        for index, component in components {
+            this.installerComponents.push(component)
         }
     }
 
@@ -53,8 +53,8 @@ class InstallerBase {
         return this.IsInstalled() ? this.Update(progress) : this.Install(progress)
     }
 
-    CountAssets() {
-        return this.installerAssets.Length
+    CountComponents() {
+        return this.installerComponents.Length
     }
 
     Install(progress := "") {
@@ -69,15 +69,15 @@ class InstallerBase {
             progress.SetDetailText(this.name . " components installing...")
         }
         
-        for index, asset in this.installerAssets {
+        for index, component in this.installerComponents {
             if (progress != "") {
-                progress.IncrementValue(1, this.name . " installing " . asset.stateKey . "...")
+                progress.IncrementValue(1, this.name . " installing " . component.stateKey . "...")
             }
 
-            if (!asset.Exists() || asset.IsOutdated()) {
-                assetSuccess := asset.Install()
+            if (!component.Exists() || component.IsOutdated()) {
+                componentSuccess := component.Install()
                 
-                if (!assetSuccess) {
+                if (!componentSuccess) {
                     success := false
                 }
             }
@@ -93,8 +93,8 @@ class InstallerBase {
             return true
         }
 
-        for index, asset in this.installerAssets {
-            if (!asset.Exists()) {
+        for index, component in this.installerComponents {
+            if (!component.Exists()) {
                 return false
             }
         }
@@ -122,8 +122,8 @@ class InstallerBase {
         }
 
         if (!isOutdated) {
-            for index, asset in this.installerAssets {
-                if (asset.IsOutdated()) {
+            for index, component in this.installerComponents {
+                if (component.IsOutdated()) {
                     isOutdated := true
                 }
             }
@@ -155,15 +155,15 @@ class InstallerBase {
         }
 
         if (progress != "") {
-            progress.SetDetailText(this.name . ": Uninstalling assets")
+            progress.SetDetailText(this.name . ": Uninstalling components")
         }
 
-        for index, asset in this.installerAssets {
+        for index, component in this.installerComponents {
             if (progress != "") {
                 progress.IncrementValue(1)
             }
 
-            asset.Uninstall()
+            component.Uninstall()
         }
 
         this.appState.RemoveVersion(this.stateKey)
diff --git a/Lib/Shared/InstallerComponent/DownloadableInstallerComponent.ahk b/Lib/Shared/InstallerComponent/DownloadableInstallerComponent.ahk
@@ -1,4 +1,4 @@
-class DownloadableInstallerAsset extends FileInstallerAssetBase {
+class DownloadableInstallerComponent extends FileInstallerComponentBase {
     downloadUrl := ""
 
     __New(downloadUrl, zipped, destPath, appState, stateKey, cache, parentStateKey := "", overwrite := false, tmpDir := "", onlyCompiled := false) {
@@ -9,6 +9,13 @@ class DownloadableInstallerAsset extends FileInstallerAssetBase {
 
     InstallFilesAction() {
         destPath := this.zipped ? this.tmpDir . "\" . this.tmpFile : this.GetDestPath()
+
+        downloadUrl := this.GetDownloadUrl()
+        
+        if (downloadUrl == "") {
+            throw AppException.new("Failed to determine download URL of installer component " . this.stateKey)
+        }
+
         Download(this.GetDownloadUrl(), destPath)
         return true
     }
diff --git a/Lib/Shared/InstallerComponent/FileInstallerComponentBase.ahk b/Lib/Shared/InstallerComponent/FileInstallerComponentBase.ahk
diff --git a/Lib/Shared/InstallerComponent/GitHubReleaseInstallerComponent.ahk b/Lib/Shared/InstallerComponent/GitHubReleaseInstallerComponent.ahk
diff --git a/Lib/Shared/InstallerComponent/InstallerComponentBase.ahk b/Lib/Shared/InstallerComponent/InstallerComponentBase.ahk
diff --git a/Lib/Shared/InstallerComponent/LibInstallerComponent.ahk b/Lib/Shared/InstallerComponent/LibInstallerComponent.ahk
diff --git a/Lib/Shared/Theme/ThemeBase.ahk b/Lib/Shared/Theme/ThemeBase.ahk

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class InstallOp extends BulkOperationBase {`
`33`	`33`
`34`	`34`	`for index, installerKey in this.installerKeys {`
`35`	`35`	`installer := this.app.Installers.GetInstaller(installerKey)`
`36`		`- count += installer.CountAssets()`
	`36`	`+ count += installer.CountComponents()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`return count`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,15 @@ class LaunchpadExeInstaller extends InstallerBase {`
`8`	`8`	`SplitPath(A_ScriptFullPath,,,,scriptNameNoExt)`
`9`	`9`	`this.isUpdater := scriptNameNoExt == this.appName . "Updater"`
`10`	`10`
`11`		`- assets := []`
	`11`	`+ components := []`
`12`	`12`
`13`	`13`	`if (this.isUpdater) {`
`14`		`- asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", this.appName . ".exe", false, "", appState, "LaunchpadExe", cache, this.appName, true, tmpDir, true)`
`15`		`- asset.version := this.version`
`16`		`- assets.Push(asset)`
	`14`	`+ component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", this.appName . ".exe", false, "", appState, "LaunchpadExe", cache, this.appName, true, tmpDir, true)`
	`15`	`+ component.version := this.version`
	`16`	`+ components.Push(component)`
`17`	`17`	`}`
`18`	`18`
`19`		`- super.__New(appState, "LaunchpadExeInstaller", cache, assets, tmpDir)`
	`19`	`+ super.__New(appState, "LaunchpadExeInstaller", cache, components, tmpDir)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`Install(progress := "") {`
`@@ -29,8 +29,8 @@ class LaunchpadExeInstaller extends InstallerBase {`
`29`	`29`	`this.movedApp := true`
`30`	`30`	`this.scriptDir := installDir`
`31`	`31`
`32`		`- for (index, asset in this.installerAssets) {`
`33`		`- asset.scriptDir := installDir`
	`32`	`+ for (index, component in this.installerComponents) {`
	`33`	`+ component.scriptDir := installDir`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,19 +3,19 @@ class ThemeInstaller extends InstallerBase {`
`3`	`3`	`version := "latest"`
`4`	`4`
`5`	`5`	`__New(appState, cache, downloadThemes := "", tmpDir := "") {`
`6`		`- assets := []`
	`6`	`+ components := []`
`7`	`7`
`8`		`- asset := GitHubReleaseInstallerAsset.new("VolantisDev/Launchpad", "LaunchpadThemes.zip", true, "Themes", appState, "LaunchpadThemes", cache, "Themes", true, tmpDir, true)`
`9`		`- asset.version := this.version`
`10`		`- assets.Push(asset)`
	`8`	`+ component := GitHubReleaseInstallerComponent.new("VolantisDev/Launchpad", "LaunchpadThemes.zip", true, "Themes", appState, "LaunchpadThemes", cache, "Themes", true, tmpDir, true)`
	`9`	`+ component.version := this.version`
	`10`	`+ components.Push(component)`
`11`	`11`
`12`	`12`	`if (downloadThemes != "") {`
`13`	`13`	`for key, url in downloadThemes {`
`14`	`14`	`path := "Themes\" . key . ".json"`
`15`		`- assets.Push(DownloadableInstallerAsset.new(url, false, path, appState, cache, key . "Theme", "Themes", false, tmpDir, false))`
	`15`	`+ components.Push(DownloadableInstallerComponent.new(url, false, path, appState, cache, key . "Theme", "Themes", false, tmpDir, false))`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- super.__New(appState, "Themes", cache, assets, tmpDir)`
	`19`	`+ super.__New(appState, "Themes", cache, components, tmpDir)`
`20`	`20`	`}`
`21`	`21`	`}`