correct type annotation

Author: SHIINASAMA

app/__main__.py

@@ -6,13 +6,14 @@
 from qasync import QApplication, run
 
 from app.builtin.gitlab_updater import GitlabUpdater
-from app.builtin.theme_manager import ThemeManager, enable_hi_dpi
 from app.main_window import MainWindow
+from qdarktheme import enable_hi_dpi
 
 
 async def task():
     app_close_event = asyncio.Event()
     app = QApplication.instance()
+    assert(app is QApplication)
     app.aboutToQuit.connect(app_close_event.set)
 
     main_window = MainWindow()
@@ -51,18 +52,13 @@ def main(enable_updater: bool = True):
     translator.load(f":/i18n/{lang_code}.qm")
     app.installTranslator(translator)
 
-    # theme
-    theme = ThemeManager()
-
     # start event loop
     run(task())
 
 
 def main_no_updater():
-    main(
-        enable_updater=False
-    )
+    main(enable_updater=False)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

app/builtin/async_widget.py

@@ -15,7 +15,7 @@ def closeEvent(self, event):
         self._closed.emit()
         super().closeEvent(event)
 
-    async def show(self):
+    async def async_show(self):
         future = asyncio.get_event_loop().create_future()
 
         def resolve_future():

app/builtin/theme_manager.py

@@ -54,39 +54,32 @@ class Updater(ABC):
     _updated_cmd = "--updater-updated"
     _disable_cmd = "--updater-disable"
 
-    _instance = None
-
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super().__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
+    current_version :Version
 
     def __init__(self):
-        if not self._initialized:
-            # Three attributes can be set by updater.json
-            self.current_version = Updater._load_current_version()
-            self.release_type = self.current_version.release_type
-            self.proxy = None
-
-            # must set in self.fetch()
-            self.remote_version = None
-            self.description = ""
-            self.download_url = ""
-            self.filename = ""
-
-            self.is_updated = False
-            self.is_enable = True
-            if Updater._copy_self_cmd in sys.argv:
-                sys.argv.remove(Updater._copy_self_cmd)
-                Updater.copy_self_and_exit()
-            if Updater._updated_cmd in sys.argv:
-                sys.argv.remove(Updater._updated_cmd)
-                self.is_updated = True
-                Updater.clean_old_package()
-            if Updater._disable_cmd in sys.argv:
-                sys.argv.remove(Updater._disable_cmd)
-                self.is_enable = False
+        # Three attributes can be set by updater.json
+        self.current_version = Updater._load_current_version()
+        self.release_type = self.current_version.release_type
+        self.proxy = None
+
+        # must set in self.fetch()
+        self.remote_version = None
+        self.description = ""
+        self.download_url = ""
+        self.filename = ""
+
+        self.is_updated = False
+        self.is_enable = True
+        if Updater._copy_self_cmd in sys.argv:
+            sys.argv.remove(Updater._copy_self_cmd)
+            Updater.copy_self_and_exit()
+        if Updater._updated_cmd in sys.argv:
+            sys.argv.remove(Updater._updated_cmd)
+            self.is_updated = True
+            Updater.clean_old_package()
+        if Updater._disable_cmd in sys.argv:
+            sys.argv.remove(Updater._disable_cmd)
+            self.is_enable = False
 
             self._initialized = True
 
@@ -115,6 +108,7 @@ def _load_current_version():
         return Version(__version__)
 
     def check_for_update(self):
+        assert(self.remote_version is Version)
         return (self.release_type == self.remote_version.release_type
                 and self.remote_version > self.current_version)
 

app/builtin/update.py

@@ -7,9 +7,9 @@
 from qasync import asyncSlot
 
 import app.resources.resource  # type: ignore
-from app.builtin.theme_manager import ThemeManager
 from app.builtin.update_widget import UpdateWidget
 from app.resources.main_window_ui import Ui_MainWindow
+from qdarktheme import setup_theme
 
 
 class MainWindow(QMainWindow):
@@ -50,7 +50,7 @@ async def check_update(self, updater):
                 await updater.fetch()
                 if updater.check_for_update():
                     update_widget = UpdateWidget(self, updater)
-                    await update_widget.show()
+                    await update_widget.async_show()
                     if update_widget.need_restart:
                         updater.apply_update()
                         self.close()
@@ -91,4 +91,4 @@ async def async_task():
 
     def change_theme(self, index):
         theme = self.ui.themeComboBox.itemData(index)
-        ThemeManager().setup_theme(theme)
+        setup_theme(theme)

app/main_window.py

@@ -9,7 +9,6 @@ dependencies = [
     "packaging>=25.0",
     "qasync>=0.28.0",
     "glom>=24.11.0",
-    "pyqtdarktheme>=0.1.6",
     "pyside6>=6.1.3",
     "singleton-decorator>=1.0.0",
 ]