SSH适配: 1.整改utils.py (分离QtUI依赖)

2.复用driver download逻辑

Signed-off-by: wuqiongjin <suchinfinity@qq.com>

Author: wuqiongjin

src/runner/runner_main.py

@@ -75,21 +75,21 @@ def main(argv: list[str] | None = None) -> int:
             driver_root = str(Path(args.driver_root).expanduser().resolve())
             Path(driver_root).mkdir(parents=True, exist_ok=True)
 
-            # 1) Prefer webdriver_manager if present (保持项目既有逻辑)
+            # 1) Prefer project existing logic (Utils.download_edge_web_driver)
             try:
-                from webdriver_manager.core.driver_cache import DriverCacheManager
-                from webdriver_manager.microsoft import EdgeChromiumDriverManager
-
-                cache = DriverCacheManager(root_dir=driver_root)
-                path = EdgeChromiumDriverManager(
-                    url="https://msedgedriver.microsoft.com/",
-                    latest_release_url="https://msedgedriver.microsoft.com/LATEST_RELEASE",
-                    cache_manager=cache,
-                ).install()
-                print(path)
-                return 0
-            except ModuleNotFoundError:
-                # Fallback without extra dependencies
+                from src.utils.utils import Utils
+
+                old_driver_root = AppPath.DriversRoot
+                try:
+                    AppPath.DriversRoot = driver_root
+                    ok, result = Utils.download_edge_web_driver()
+                finally:
+                    AppPath.DriversRoot = old_driver_root
+
+                if ok:
+                    print(result)
+                    return 0
+            except Exception:
                 pass
 
             # 2) Fallback: download zip and extract to driver_root/.wdm/drivers/edgedriver/linux64/<version>/

src/ui/ui.py

@@ -15,7 +15,8 @@
 from src.utils.const import Key, AppPath, WebPath
 from src.ui.ui_message import MessageBox
 from src.utils.update import VersionCheckThread
-from src.utils.utils import Utils, QtUI
+from src.utils.utils import Utils
+from src.utils.qt_ui import QtUI
 from src.core.clock_manager import ClockManager, run_clock
 
 # 根据操作系统导入相应的模块

src/ui/ui_system_plan.py

@@ -9,7 +9,8 @@
 from src.utils.log import Log
 from src.utils.const import Key
 from src.ui.ui_calendar import Calendar, WeeklyCalendar
-from src.utils.utils import Utils, QtUI
+from src.utils.utils import Utils
+from src.utils.qt_ui import QtUI
 from src.ui.ui_message import MessageBox
 
 

src/utils/qt_ui.py

@@ -0,0 +1,23 @@
+from PyQt5.QtGui import QFont
+from PyQt5.QtWidgets import QLabel
+
+
+class QtUI:
+    @staticmethod
+    def create_label(message, size=11, length=150, family="Arial", width_policy=None, height_policy=None,
+                     alignment=None, fixed_width=None, fixed_height=None):
+        label = QLabel(message)
+        font = QFont()
+        font.setFamily(family)
+        font.setPointSize(size)
+        label.setFont(font)
+        label.setFixedWidth(length)
+        if width_policy is not None and height_policy is not None:
+            label.setSizePolicy(width_policy, height_policy)
+        if alignment is not None:
+            label.setAlignment(alignment)
+        if fixed_width is not None:
+            label.setFixedWidth(fixed_width)
+        if fixed_height is not None:
+            label.setFixedHeight(fixed_height)
+        return label

src/utils/utils.py

@@ -10,9 +10,6 @@
 from webdriver_manager.core.driver_cache import DriverCacheManager
 from webdriver_manager.microsoft import EdgeChromiumDriverManager
 
-from PyQt5.QtGui import QFont
-from PyQt5.QtWidgets import QLabel
-
 from src.utils.log import Log
 from src.utils.const import Key, AppPath
 
@@ -267,24 +264,4 @@ def download_edge_web_driver(target_os: str | None = None, target_arch: str | No
             else:
                 os.environ["WDM_ARCH"] = old_wdm_arch
 
-        return True, driver_path
-
-class QtUI:
-    @staticmethod
-    def create_label(message, size=11, length=150, family="Arial", width_policy=None, height_policy=None,
-                     alignment=None, fixed_width=None, fixed_height=None):
-        label = QLabel(message)
-        font = QFont()
-        font.setFamily(family)
-        font.setPointSize(size)
-        label.setFont(font)
-        label.setFixedWidth(length)
-        if width_policy is not None and height_policy is not None:
-            label.setSizePolicy(width_policy, height_policy)
-        if alignment is not None:
-            label.setAlignment(alignment)
-        if fixed_width is not None:
-            label.setFixedWidth(fixed_width)
-        if fixed_height is not None:
-            label.setFixedHeight(fixed_height)
-        return label
+        return True, driver_path

ui/custom/custom_widget.py

@@ -2,7 +2,8 @@
 from PyQt5.QtWidgets import QLineEdit, QCheckBox, QWidget, QHBoxLayout, QPushButton, QFileDialog, QComboBox
 
 from src.utils.const import Key
-from src.utils.utils import QtUI, Utils
+from src.utils.utils import Utils
+from src.utils.qt_ui import QtUI
 from src.utils.const import AppPath