优化代码

Author: lzy98276

app/core/app_init.py

@@ -8,30 +8,31 @@
 from app.tools.variable import APP_INIT_DELAY
 from app.core.font_manager import apply_font_settings
 from app.core.window_manager import WindowManager
+from app.core.utils import safe_execute
 
 
 class AppInitializer:
     """应用程序初始化器，负责协调所有初始化任务"""
 
-    def __init__(self, window_manager: WindowManager):
+    def __init__(self, window_manager: WindowManager) -> None:
         """初始化应用初始化器
 
         Args:
             window_manager: 窗口管理器实例
         """
         self.window_manager = window_manager
 
-    def initialize(self):
+    def initialize(self) -> None:
         """初始化应用程序"""
         self._manage_settings_file()
         self._schedule_initialization_tasks()
         logger.debug("应用初始化调度已启动，主窗口将在延迟后创建")
 
-    def _manage_settings_file(self):
+    def _manage_settings_file(self) -> None:
         """管理设置文件，确保其存在且完整"""
         manage_settings_file()
 
-    def _schedule_initialization_tasks(self):
+    def _schedule_initialization_tasks(self) -> None:
         """调度所有初始化任务"""
         self._load_theme()
         self._load_theme_color()
@@ -40,48 +41,70 @@ def _schedule_initialization_tasks(self):
         self._create_main_window()
         self._apply_font_settings()
 
-    def _load_theme(self):
+    def _load_theme(self) -> None:
         """加载主题设置"""
-        from qfluentwidgets import setTheme, Theme
-
         QTimer.singleShot(
             APP_INIT_DELAY,
-            lambda: (
-                setTheme(Theme.DARK)
-                if readme_settings_async("basic_settings", "theme") == "DARK"
-                else (
-                    setTheme(Theme.AUTO)
-                    if readme_settings_async("basic_settings", "theme") == "AUTO"
-                    else setTheme(Theme.LIGHT)
-                )
-            ),
+            lambda: safe_execute(self._apply_theme, error_message="加载主题失败"),
         )
 
-    def _load_theme_color(self):
+    def _apply_theme(self) -> None:
+        """应用主题设置"""
+        from qfluentwidgets import setTheme, Theme
+
+        theme = readme_settings_async("basic_settings", "theme")
+        if theme == "DARK":
+            setTheme(Theme.DARK)
+        elif theme == "AUTO":
+            setTheme(Theme.AUTO)
+        else:
+            setTheme(Theme.LIGHT)
+
+    def _load_theme_color(self) -> None:
         """加载主题颜色"""
         from qfluentwidgets import setThemeColor
 
         QTimer.singleShot(
             APP_INIT_DELAY,
-            lambda: setThemeColor(
-                readme_settings_async("basic_settings", "theme_color")
+            lambda: safe_execute(
+                lambda: setThemeColor(
+                    readme_settings_async("basic_settings", "theme_color")
+                ),
+                error_message="加载主题颜色失败",
             ),
         )
 
-    def _clear_restart_record(self):
+    def _clear_restart_record(self) -> None:
         """清除重启记录"""
-        QTimer.singleShot(APP_INIT_DELAY, lambda: remove_record("", "", "", "restart"))
+        QTimer.singleShot(
+            APP_INIT_DELAY,
+            lambda: safe_execute(
+                lambda: remove_record("", "", "", "restart"),
+                error_message="清除重启记录失败",
+            ),
+        )
 
-    def _check_updates(self):
+    def _check_updates(self) -> None:
         """检查是否需要安装更新"""
-        QTimer.singleShot(APP_INIT_DELAY, lambda: check_for_updates_on_startup(None))
+        QTimer.singleShot(
+            APP_INIT_DELAY,
+            lambda: safe_execute(
+                lambda: check_for_updates_on_startup(None), error_message="检查更新失败"
+            ),
+        )
 
-    def _create_main_window(self):
+    def _create_main_window(self) -> None:
         """创建主窗口实例（但不自动显示）"""
         QTimer.singleShot(
-            APP_INIT_DELAY, lambda: self.window_manager.create_main_window()
+            APP_INIT_DELAY,
+            lambda: safe_execute(
+                self.window_manager.create_main_window, error_message="创建主窗口失败"
+            ),
         )
 
-    def _apply_font_settings(self):
+    def _apply_font_settings(self) -> None:
         """应用字体设置"""
-        QTimer.singleShot(APP_INIT_DELAY, lambda: apply_font_settings())
+        QTimer.singleShot(
+            APP_INIT_DELAY,
+            lambda: safe_execute(apply_font_settings, error_message="应用字体设置失败"),
+        )

app/core/font_manager.py

@@ -1,70 +1,89 @@
 import os
+from typing import Optional
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtWidgets import QApplication, QWidget
 from loguru import logger
 
 from app.tools.settings_access import readme_settings_async
 from app.tools.variable import FONT_APPLY_DELAY
+from app.core.utils import safe_execute
 
 
-def configure_dpi_scale():
+def configure_dpi_scale() -> None:
     """在创建QApplication之前配置DPI缩放模式"""
     try:
-        dpiScale = readme_settings_async("basic_settings", "dpiScale")
-        if dpiScale == "Auto":
-            QApplication.setHighDpiScaleFactorRoundingPolicy(
-                Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
-            )
-            os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "1"
-            logger.debug("DPI缩放已设置为自动模式")
+        dpi_scale = readme_settings_async("basic_settings", "dpiScale")
+        if dpi_scale == "Auto":
+            _set_auto_dpi()
         else:
-            os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0"
-            os.environ["QT_SCALE_FACTOR"] = str(dpiScale)
-            logger.debug(f"DPI缩放已设置为{dpiScale}倍")
+            _set_manual_dpi(dpi_scale)
     except Exception as e:
         logger.warning(f"读取DPI设置失败，使用默认设置: {e}")
-        QApplication.setHighDpiScaleFactorRoundingPolicy(
-            Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
-        )
-        os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "1"
+        _set_auto_dpi()
 
 
-def apply_font_settings():
+def _set_auto_dpi() -> None:
+    """设置自动DPI缩放"""
+    QApplication.setHighDpiScaleFactorRoundingPolicy(
+        Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
+    )
+    os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "1"
+    logger.debug("DPI缩放已设置为自动模式")
+
+
+def _set_manual_dpi(scale: str) -> None:
+    """设置手动DPI缩放
+
+    Args:
+        scale: 缩放倍数
+    """
+    os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0"
+    os.environ["QT_SCALE_FACTOR"] = str(scale)
+    logger.debug(f"DPI缩放已设置为{scale}倍")
+
+
+def apply_font_settings() -> None:
     """应用字体设置 - 优化版本，使用字体管理器异步加载"""
     font_family = readme_settings_async("basic_settings", "font")
 
     from qfluentwidgets import setFontFamilies
 
     setFontFamilies([font_family])
-    QTimer.singleShot(FONT_APPLY_DELAY, lambda: apply_font_to_application(font_family))
+    QTimer.singleShot(
+        FONT_APPLY_DELAY,
+        lambda: safe_execute(
+            apply_font_to_application, font_family, error_message="应用字体失败"
+        ),
+    )
 
 
-def apply_font_to_application(font_family: str):
+def apply_font_to_application(font_family: str) -> None:
     """应用字体设置到整个应用程序，优化版本使用字体管理器
 
     Args:
-        font_family (str): 字体家族名称
+        font_family: 字体家族名称
     """
-    try:
-        current_font = QApplication.font()
-        app_font = current_font
-        app_font.setFamily(font_family)
-        widgets_updated = 0
-        widgets_skipped = 0
-        for widget in QApplication.allWidgets():
-            if isinstance(widget, QWidget):
-                if update_widget_fonts(widget, app_font, font_family):
-                    widgets_updated += 1
-                else:
-                    widgets_skipped += 1
-        logger.debug(
-            f"已应用字体: {font_family}, 更新了{widgets_updated}个控件字体, 跳过了{widgets_skipped}个已有相同字体的控件"
-        )
-    except Exception as e:
-        logger.error(f"应用字体失败: {e}")
+    current_font = QApplication.font()
+    app_font = current_font
+    app_font.setFamily(font_family)
 
+    widgets_updated = 0
+    widgets_skipped = 0
+
+    for widget in QApplication.allWidgets():
+        if isinstance(widget, QWidget):
+            if update_widget_fonts(widget, app_font, font_family):
+                widgets_updated += 1
+            else:
+                widgets_skipped += 1
 
-def update_widget_fonts(widget: QWidget, font, font_family: str) -> bool:
+    logger.debug(
+        f"已应用字体: {font_family}, 更新了{widgets_updated}个控件字体, "
+        f"跳过了{widgets_skipped}个已有相同字体的控件"
+    )
+
+
+def update_widget_fonts(widget: Optional[QWidget], font, font_family: str) -> bool:
     """更新控件及其子控件的字体，优化版本减少内存占用，特别处理ComboBox等控件
 
     Args:
@@ -78,27 +97,22 @@ def update_widget_fonts(widget: QWidget, font, font_family: str) -> bool:
     if widget is None:
         return False
 
-    try:
-        if not hasattr(widget, "font") or not hasattr(widget, "setFont"):
-            return False
-        current_widget_font = widget.font()
-        if current_widget_font.family() == font_family:
-            updated = False
-        else:
-            new_font = font
-            new_font.setBold(current_widget_font.bold())
-            new_font.setItalic(current_widget_font.italic())
-            widget.setFont(new_font)
-            updated = True
+    if not hasattr(widget, "font") or not hasattr(widget, "setFont"):
+        return False
 
-        if isinstance(widget, QWidget):
-            children = widget.children()
-            for child in children:
-                if isinstance(child, QWidget):
-                    child_updated = update_widget_fonts(child, font, font_family)
-                    if child_updated:
-                        updated = True
-        return updated
-    except Exception as e:
-        logger.exception("更新控件字体时发生异常: {}", e)
+    current_widget_font = widget.font()
+    if current_widget_font.family() == font_family:
         return False
+
+    new_font = font
+    new_font.setBold(current_widget_font.bold())
+    new_font.setItalic(current_widget_font.italic())
+    widget.setFont(new_font)
+
+    if isinstance(widget, QWidget):
+        children = widget.children()
+        for child in children:
+            if isinstance(child, QWidget):
+                update_widget_fonts(child, font, font_family)
+
+    return True