修复未设置密码时的无限递归问题，开始打包

Author: lzy98276

app/tools/path_utils.py

@@ -19,6 +19,7 @@
 # ==================================================
 # 导入模块
 # ==================================================
+import os
 import sys
 from pathlib import Path
 from typing import Union
@@ -65,16 +66,46 @@ def get_absolute_path(self, relative_path: Union[str, Path]) -> Path:
         Returns:
             Path: 绝对路径
         """
-        if isinstance(relative_path, str):
-            relative_path = Path(relative_path)
+        # 转换为字符串
+        if isinstance(relative_path, Path):
+            relative_path_str = str(relative_path)
+        else:
+            relative_path_str = relative_path
 
-        # 如果已经是绝对路径，直接返回
-        if relative_path.is_absolute():
-            return relative_path
+        # 获取app_root的字符串表示
+        app_root_str = str(self._app_root)
 
-        # 拼接为绝对路径
-        absolute_path = self._app_root / relative_path
-        return absolute_path
+        # 使用字符串检查判断是否为绝对路径
+        # Windows绝对路径：以驱动器号开头，如 C:\ 或 c:/
+        # Linux绝对路径：以 / 开头
+        if os.name == "nt":
+            is_absolute = relative_path_str.startswith(("\\", "/")) or (
+                len(relative_path_str) >= 2 and relative_path_str[1] == ":"
+            )
+        else:
+            is_absolute = relative_path_str.startswith("/")
+
+        if is_absolute:
+            # 直接返回Path对象
+            return Path(relative_path_str)
+
+        # 使用字符串拼接构建绝对路径，避免使用Path的/运算符
+        # 确保路径分隔符正确
+        if os.name == "nt":
+            # Windows使用\作为路径分隔符
+            if relative_path_str.startswith("\\") or relative_path_str.startswith("/"):
+                # 去掉相对路径开头的分隔符
+                relative_path_str = relative_path_str[1:]
+            absolute_path_str = rf"{app_root_str}\{relative_path_str}"
+        else:
+            # Linux使用/作为路径分隔符
+            if relative_path_str.startswith("/"):
+                # 去掉相对路径开头的分隔符
+                relative_path_str = relative_path_str[1:]
+            absolute_path_str = f"{app_root_str}/{relative_path_str}"
+
+        # 返回Path对象
+        return Path(absolute_path_str)
 
     def ensure_directory_exists(self, path: Union[str, Path]) -> Path:
         """确保目录存在，如果不存在则创建

app/tools/secure_store.py

@@ -94,6 +94,14 @@ def _decrypt_payload(payload: bytes, key: bytes) -> bytes:
 
 def read_secrets() -> dict:
     p = get_settings_path("secrets.json")
+    # 不存在则创建空文件
+    if not os.path.exists(p):
+        ensure_dir(os.path.dirname(p))
+        with open(p, "wb") as f:
+            f.write(b"")
+        _set_hidden(p)
+        logger.debug(f"创建空安全配置文件：{p}")
+        return {}
     if os.path.exists(p):
         try:
             with open(p, "rb") as f:

app/view/settings/safety_settings.py

@@ -418,11 +418,19 @@ def apply():
     def __on_setting_changed(self, first_level_key, second_level_key, value):
         if first_level_key != "basic_safety_settings":
             return
-        if second_level_key == "safety_switch":
+        # 只在状态不同时才更新，避免不必要的信号触发
+        if (
+            second_level_key == "safety_switch"
+            and self.safety_switch.isChecked() != bool(value)
+        ):
             self.safety_switch.setChecked(bool(value))
-        elif second_level_key == "totp_switch":
+        elif second_level_key == "totp_switch" and self.totp_switch.isChecked() != bool(
+            value
+        ):
             self.totp_switch.setChecked(bool(value))
-        elif second_level_key == "usb_switch":
+        elif second_level_key == "usb_switch" and self.usb_switch.isChecked() != bool(
+            value
+        ):
             self.usb_switch.setChecked(bool(value))
         enabled = password_is_configured()
         self.totp_switch.setEnabled(enabled)
@@ -721,21 +729,45 @@ def __on_ops_setting_changed(self, first_level_key, second_level_key, value):
         if first_level_key != "basic_safety_settings":
             return
         self._ensure_ops_disabled_if_no_password()
-        if second_level_key == "show_hide_floating_window_switch":
+        # 只在状态不同时才更新，避免不必要的信号触发
+        if (
+            second_level_key == "show_hide_floating_window_switch"
+            and self.show_hide_floating_window_switch.isChecked() != bool(value)
+        ):
             self.show_hide_floating_window_switch.setChecked(bool(value))
-        elif second_level_key == "restart_switch":
+        elif (
+            second_level_key == "restart_switch"
+            and self.restart_switch.isChecked() != bool(value)
+        ):
             self.restart_switch.setChecked(bool(value))
-        elif second_level_key == "exit_switch":
+        elif second_level_key == "exit_switch" and self.exit_switch.isChecked() != bool(
+            value
+        ):
             self.exit_switch.setChecked(bool(value))
-        elif second_level_key == "open_settings_switch":
+        elif (
+            second_level_key == "open_settings_switch"
+            and self.open_settings_switch.isChecked() != bool(value)
+        ):
             self.open_settings_switch.setChecked(bool(value))
-        elif second_level_key == "diagnostic_export_switch":
+        elif (
+            second_level_key == "diagnostic_export_switch"
+            and self.diagnostic_export_switch.isChecked() != bool(value)
+        ):
             self.diagnostic_export_switch.setChecked(bool(value))
-        elif second_level_key == "data_export_switch":
+        elif (
+            second_level_key == "data_export_switch"
+            and self.data_export_switch.isChecked() != bool(value)
+        ):
             self.data_export_switch.setChecked(bool(value))
-        elif second_level_key == "import_overwrite_switch":
+        elif (
+            second_level_key == "import_overwrite_switch"
+            and self.import_overwrite_switch.isChecked() != bool(value)
+        ):
             self.import_overwrite_switch.setChecked(bool(value))
-        elif second_level_key == "import_version_mismatch_switch":
+        elif (
+            second_level_key == "import_version_mismatch_switch"
+            and self.import_version_mismatch_switch.isChecked() != bool(value)
+        ):
             self.import_version_mismatch_switch.setChecked(bool(value))
 
     def _ensure_ops_disabled_if_no_password(self):
@@ -763,10 +795,12 @@ def _ensure_ops_disabled_if_no_password(self):
                 ("import_version_mismatch_switch", self.import_version_mismatch_switch),
             ]:
                 try:
-                    sw.blockSignals(True)
-                    sw.setChecked(False)
-                    sw.blockSignals(False)
-                    update_settings("basic_safety_settings", key, False)
+                    # 检查开关当前状态，如果已经是False，就不需要再次更新
+                    if sw.isChecked():
+                        sw.blockSignals(True)
+                        sw.setChecked(False)
+                        sw.blockSignals(False)
+                        update_settings("basic_safety_settings", key, False)
                 except Exception:
                     pass
 

main.py

@@ -367,13 +367,6 @@ def show_float_window():
 # ==================================================
 def initialize_app():
     """初始化应用程序"""
-    program_dir = str(get_app_root())
-
-    # 更改当前工作目录
-    if os.getcwd() != program_dir:
-        os.chdir(program_dir)
-        logger.debug(f"工作目录已设置为: {program_dir}")
-
     # 管理设置文件，确保其存在且完整
     manage_settings_file()
 
@@ -445,7 +438,14 @@ def main_async():
 
 
 if __name__ == "__main__":
-    # 初始化日志记录器
+    program_dir = str(get_app_root())
+
+    # 更改当前工作目录
+    if os.getcwd() != program_dir:
+        os.chdir(program_dir)
+        logger.debug(f"工作目录已设置为: {program_dir}")
+
+    # 配置日志系统
     logger.remove()
     # 首先配置日志系统
     configure_logging()