Improved some updater scaling UI, and actually checking each version …

…in the version to not "update" to "old" version. And bumped version number
VilleOlof · Apr 28, 2023 · 26bcaf4 · 26bcaf4
1 parent 2328ea0
commit 26bcaf4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/AppSettings.json b/AppSettings.json
@@ -1,6 +1,6 @@
 {
     "PluginID": "com.villeolof.toolbox",
-    "Version": "1.0.1",
+    "Version": "1.0.2",
     "DataCollection": true,
     "Debug": false,
     "DisableShortcut-Keybind": "F1",

diff --git a/src/Components/Update.svelte b/src/Components/Update.svelte
@@ -4,7 +4,7 @@
 
     let showPopup: boolean = false;
     let updateInfo: Updater.UpdateReturn;
-    
+
     onMount(async () => {
         updateInfo = await Updater.CheckForUpdate();
         showPopup = updateInfo.updateAvailable;
@@ -52,8 +52,8 @@
     }
 
     .popup-content {
-        width: 35%;
-        height: 35%;
+        width: 30rem;
+        height: 20rem;
 
         display: flex;
         flex-direction: column;

diff --git a/src/Lib/Updater.ts b/src/Lib/Updater.ts
@@ -20,12 +20,25 @@ export namespace Updater {
         const localVersion: string = AppSettings.GetSetting("Version");
 
         return {
-            updateAvailable: githubVersion !== localVersion,
+            updateAvailable: CheckVersionNumbers(githubVersion, localVersion),
             remoteVersion: githubVersion,
             localVersion: localVersion
         };
     }
 
+    function CheckVersionNumbers(newVersion: string, oldVersion: string): boolean {
+        const newVersionNumbers: string[] = newVersion.split('.');
+        const oldVersionNumbers: string[] = oldVersion.split('.');
+
+        for (let i = 0; i < newVersionNumbers.length; i++) {
+            if (parseInt(newVersionNumbers[i]) > parseInt(oldVersionNumbers[i])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     export function DownloadUpdate(): void {
         const curlCommand: ChildProcess = Common.ExecuteCommand(`curl.exe -L ${RepoZIPUrl} -o "${root}../Toolbox.zip"`, `${root}../`);
         curlCommand.stdout.on('data', (data) => {