more updater fixesv2.0.4-f015e00-pre

3 files changed, 7 insertions, 10 deletions

diff --git a/backend/injector.py b/backend/injector.py
index ddccdf8f..5738cba5 100644
--- a/backend/injector.py
+++ b/backend/injector.py
@@ -33,7 +33,7 @@ class Tab:
             return (await self.websocket.receive_json()) if receive else None
         raise RuntimeError("Websocket not opened")
 
-    async def evaluate_js(self, js, run_async=False, manage_socket=True):
+    async def evaluate_js(self, js, run_async=False, manage_socket=True, get_result=True):
         if manage_socket:
             await self.open_websocket()
 
@@ -45,7 +45,7 @@ class Tab:
                 "userGesture": True,
                 "awaitPromise": run_async
             }
-        })
+        }, get_result)
 
         if manage_socket:
             await self.client.close()
diff --git a/backend/updater.py b/backend/updater.py
index c0379b6f..4c3cd715 100644
--- a/backend/updater.py
+++ b/backend/updater.py
@@ -59,7 +59,7 @@ class Updater:
             return {
                 "current": self.localVer,
                 "remote": self.remoteVer,
-                "updatable": self.remoteVer != None
+                "updatable": self.localVer != None
             }
         else:
             return {"current": "unknown", "updatable": False}
@@ -103,8 +103,7 @@ class Updater:
                         raw += len(c)
                         new_progress = round((raw / total) * 100)
                         if progress != new_progress:
-                            if new_progress - progress>= 2:
-                                self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({progress})", False, False))
+                            self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
                             progress = new_progress
 
                 with open(path.join(getcwd(), ".loader.version"), "w") as out:
@@ -119,4 +118,3 @@ class Updater:
     async def do_restart(self):
         call(["systemctl", "daemon-reload"])
         call(["systemctl", "restart", "plugin_loader"])
-        exit(0)
diff --git a/frontend/src/components/settings/pages/general/Updater.tsx b/frontend/src/components/settings/pages/general/Updater.tsx
index e7277631..106af6f3 100644
--- a/frontend/src/components/settings/pages/general/Updater.tsx
+++ b/frontend/src/components/settings/pages/general/Updater.tsx
@@ -52,9 +52,9 @@ export default function UpdaterSettings() {
     >
       {updateProgress == -1 ? (
         <DialogButton
-          disabled={!versionInfo?.updatable || !versionInfo?.remote || checkingForUpdates}
+          disabled={!versionInfo?.updatable || checkingForUpdates}
           onClick={
-            versionInfo?.remote?.tag_name == versionInfo?.current
+            !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
               ? async () => {
                   setCheckingForUpdates(true);
                   const res = (await callUpdaterMethod('check_for_updates')) as { result: VerInfo };
@@ -79,7 +79,7 @@ export default function UpdaterSettings() {
         >
           {checkingForUpdates
             ? 'Checking'
-            : versionInfo?.remote?.tag_name == versionInfo?.current
+            : !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
             ? 'Check For Updates'
             : 'Install Update'}
         </DialogButton>
@@ -88,7 +88,6 @@ export default function UpdaterSettings() {
           layout="inline"
           bottomSeparator={false}
           nProgress={updateProgress}
-          nTransitionSec={0.01}
           indeterminate={reloading}
           sOperationText={reloading ? 'Reloading' : 'Updating'}
         />