fix updater config file path and debug check

Author: SHIINASAMA

app/__main__.py

@@ -36,8 +36,8 @@ def main(enable_updater: bool = True):
     updater.is_enable = enable_updater
 
     # override updater config
-    config_file = paths.update_dir.join("updater.json")
-    if os.getenv("DEBUG", "0") == 1 and config_file.exists() and config_file.is_file():
+    config_file = paths.update_dir / "updater.json"
+    if os.getenv("DEBUG", "0") == "1" and config_file.exists() and config_file.is_file():
         updater.load_from_file_and_override(config_file)
 
     # check if the app is already running

app/builtin/github_updater.py

@@ -69,4 +69,4 @@ async def fetch(self):
             r.raise_for_status()
 
             paths = AppPaths()
-            self.filename = f"{paths.update_tmp}/{package_name}"
+            self.filename = f"{paths.update_dir}/{package_name}"

app/builtin/gitlab_updater.py

@@ -85,4 +85,4 @@ async def fetch(self):
 
             path = urlparse(self.download_url).path
             paths = AppPaths()
-            self.filename = f"{paths.update_tmp}/{os.path.basename(path)}"
+            self.filename = f"{paths.update_dir}/{os.path.basename(path)}"

app/builtin/paths.py

@@ -2,6 +2,7 @@
 from singleton_decorator import singleton
 from PySide6.QtCore import QStandardPaths, QCoreApplication
 
+
 @singleton
 class AppPaths:
     base_dir: Path
@@ -12,11 +13,15 @@ def __init__(self, *, base_dir=None):
             app = QCoreApplication.instance()
             if app is None:
                 raise RuntimeError("QCoreApplication instance is not created yet.")
-            self.base_dir = Path(QStandardPaths.writableLocation(QStandardPaths.StandardLocation.AppDataLocation))
+            self.base_dir = Path(
+                QStandardPaths.writableLocation(
+                    QStandardPaths.StandardLocation.AppDataLocation
+                )
+            )
         else:
             self.base_dir = base_dir
 
-        self.update_dir = self.base_dir / "update_tmp"
+        self.update_dir = self.base_dir / "update"
 
         self.base_dir.mkdir(parents=True, exist_ok=True)
         self.update_dir.mkdir(parents=True, exist_ok=True)

app/builtin/update.py

@@ -150,7 +150,7 @@ def apply_update():
         pid = os.getpid()
         paths = AppPaths()
         if sys.platform == "darwin":
-            new_executable_name = f"{paths.update_tmp}/{cfg.APP_NAME}.app"
+            new_executable_name = f"{paths.update_dir}/{cfg.APP_NAME}.app"
             subprocess.Popen(
                 [
                     "open",
@@ -164,11 +164,11 @@ def apply_update():
                 ],
                 preexec_fn=os.setpgrp,
                 env=os.environ.copy(),
-                cwd=paths.update_tmp,
+                cwd=paths.update_dir,
             )
         elif sys.platform == "linux":
-            new_executable_name = Path(f"{paths.update_tmp}/{cfg.APP_NAME}")
-            work_dir = Path(f"{paths.update_tmp}")
+            new_executable_name = Path(f"{paths.update_dir}/{cfg.APP_NAME}")
+            work_dir = Path(f"{paths.update_dir}")
             if new_executable_name.is_dir():
                 # Onedir
                 work_dir = new_executable_name
@@ -187,11 +187,11 @@ def apply_update():
                 cwd=work_dir,
             )
         else:  # win32
-            new_executable_name = Path(f"{paths.update_tmp}/{cfg.APP_NAME}")
+            new_executable_name = Path(f"{paths.update_dir}/{cfg.APP_NAME}")
             new_executable_name_with_exe = Path(
-                f"{paths.update_tmp}/{cfg.APP_NAME}.exe"
+                f"{paths.update_dir}/{cfg.APP_NAME}.exe"
             )
-            work_dir = Path(f"{paths.update_tmp}")
+            work_dir = Path(f"{paths.update_dir}")
             if new_executable_name.is_dir():
                 # Onedir
                 work_dir = new_executable_name
@@ -308,7 +308,7 @@ def clean_old_package():
 
         # Remove files in package_dir
         paths = AppPaths()
-        package_dir = paths.update_tmp
+        package_dir = paths.update_dir
         if package_dir.exists() and package_dir.is_dir():
             for entry in os.scandir(package_dir):
                 entry_path = Path(entry.path)