From 3ec89c7fbc703c8197535dfb3093c51ec2f9d2dd Mon Sep 17 00:00:00 2001
From: Kenshin <kenshin9955@hotmail.fr>
Date: Wed, 18 Jan 2023 23:50:02 +0100
Subject: [PATCH] Fix updater

---
 app.py             |  4 ++--
 updater/updater.py | 14 ++++++++------
 utils/sys_utils.py |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app.py b/app.py
index 282ab61..94685c2 100644
--- a/app.py
+++ b/app.py
@@ -11,8 +11,8 @@
 if __name__ == "__main__":
     fire.Fire(videodl_logger)
     logger.debug("Updating the app")
-    update_succeeded = update_app()
-    if update_succeeded:
+    app_has_been_updated = update_app()
+    if not app_has_been_updated:
         logger.debug("GUI's startup")
         videodl_gui()
 
diff --git a/updater/updater.py b/updater/updater.py
index b7758f7..e53457b 100644
--- a/updater/updater.py
+++ b/updater/updater.py
@@ -79,17 +79,18 @@ def get_latest_version(self) -> str:
                 ARCHITECTURE = "x86"
         return latest_version
 
-    def update_app(self) -> None:
+    def update_app(self) -> bool:
         """
         Check if a new version of the app is available. Download it if there is
+        Returns:
+            bool: Whether or not the app has been updated
         """
         if not self._new_version_is_available():
             log.info("No newer version found")
-            return
+            return False
         log.info("New version found")
         ft.app(target=self._download_and_replace)
-        self.page.window_close()
-        sys.exit(0)
+        return True
 
     def _new_version_is_available(self) -> bool:
         """
@@ -191,6 +192,8 @@ def _download_and_replace(self, page: ft.Page) -> None:
             raise AssertionError
         log.info("Restarting...")
         self._replace_with_latest(latest_archive_name)
+        self.page.window_close()
+        sys.exit(0)
 
     def _download_latest_version(self, latest_archive_name: str) -> None:
         """
@@ -397,11 +400,10 @@ def update_progress_bar(
 
 def update_app() -> bool:
     try:
-        Updater().update_app()
+        return Updater().update_app()
     except PermissionError:
         ft.app(target=permission_error_gui)
         return False
-    return True
 
 
 def permission_error_gui(page: ft.Page):
diff --git a/utils/sys_utils.py b/utils/sys_utils.py
index b69140f..16d14e5 100644
--- a/utils/sys_utils.py
+++ b/utils/sys_utils.py
@@ -11,7 +11,7 @@
 import flet as ft
 
 APP_NAME = "video-dl"
-APP_VERSION = "1.0.7"
+APP_VERSION = "1.0.8"
 PLATFORM = system()
 VERSIONS_ARCHIVE_NAME = "versions.zip"
 VERSIONS_JSON_NAME = "versions.json"