fix: restart desktop after automatic update

Author: hgmzhn

git_update_helpers.py desktop_qt_ui/core/git_update_helpers.pygit_update_helpers.py renamed to desktop_qt_ui/core/git_update_helpers.py

@@ -7,7 +7,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     commits_behind,
     current_commit,
     fetch_origin,

desktop_qt_ui/services/update_service.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Callable
 
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     GIT_MIRRORS,
     current_commit,
     git_executable,

desktop_qt_ui/ui/main_page/pages/about_page.py

@@ -21,21 +21,21 @@
 if str(PATH_ROOT) not in sys.path:
     sys.path.insert(0, str(PATH_ROOT))
 
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     GIT_MIRRORS as SHARED_GIT_MIRRORS,
 )
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     SUPPORTED_BRANCHES as SHARED_SUPPORTED_BRANCHES,
 )
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     current_branch as shared_current_branch,
 )
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     fetch_origin,
     git_output,
     set_origin_url,
 )
-from git_update_helpers import (
+from desktop_qt_ui.core.git_update_helpers import (
     update_branch as shared_update_branch,
 )
 
@@ -693,33 +693,20 @@ def restart_maintenance(action):
         raise SystemExit(1) from e
 
 def restart_desktop_ui():
-    """Start a fresh desktop UI process after automatic maintenance finishes."""
-    try:
-        if sys.platform == "win32":
-            start_script = PATH_ROOT / "Win-Start.bat"
-            if start_script.exists():
-                subprocess.Popen(
-                    ["cmd.exe", "/d", "/c", str(start_script)],
-                    cwd=PATH_ROOT,
-                    creationflags=(
-                        subprocess.CREATE_NEW_PROCESS_GROUP
-                        | subprocess.DETACHED_PROCESS
-                    ),
-                )
-                return True
-        unix_start = PATH_ROOT / "Unix-Start.sh"
-        if unix_start.exists():
-            subprocess.Popen(
-                [str(unix_start)],
-                cwd=PATH_ROOT,
-                start_new_session=True,
-            )
-            return True
-        subprocess.Popen(
-            [sys.executable, str(PATH_ROOT / "desktop_qt_ui" / "main.py")],
-            cwd=PATH_ROOT,
-            start_new_session=True,
+    """Restart the desktop UI with the interpreter that completed maintenance."""
+    command = [sys.executable, str(PATH_ROOT / "desktop_qt_ui" / "main.py")]
+    kwargs = {"cwd": PATH_ROOT}
+    if sys.platform == "win32":
+        kwargs["creationflags"] = (
+            subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS
         )
+    else:
+        kwargs["start_new_session"] = True
+
+    print(L("正在重新启动桌面端...", "Restarting the desktop UI..."))
+    sys.stdout.flush()
+    try:
+        subprocess.Popen(command, **kwargs)
         return True
     except OSError as exc:
         print(
@@ -2941,13 +2928,16 @@ def __init__(self):
         if not resume_updated_code(args, resume_action):
             raise SystemExit(1)
         if automatic:
-            restart_desktop_ui()
+            if not restart_desktop_ui():
+                raise SystemExit(1)
             return
         input(L("\n按回车键继续...", "\nPress Enter to continue..."))
 
     if automatic:
-        run_full_update(args, automatic=True)
-        restart_desktop_ui()
+        if not run_full_update(args, automatic=True):
+            raise SystemExit(1)
+        if not restart_desktop_ui():
+            raise SystemExit(1)
         return
 
     # 首次显示版本信息

packaging/launch.py

@@ -125,3 +125,42 @@ def test_automatic_full_update_skips_confirmation(monkeypatch):
     args = type("Args", (), {"requirements": "auto"})()
     assert maintenance_launch.run_full_update(args, automatic=True)
     assert dependency_updates == [["example-package"]]
+
+
+def test_restart_desktop_ui_uses_current_maintenance_interpreter(monkeypatch):
+    captured = {}
+
+    def fake_popen(args, **kwargs):
+        captured["args"] = args
+        captured["kwargs"] = kwargs
+        return object()
+
+    monkeypatch.setattr(maintenance_launch.subprocess, "Popen", fake_popen)
+    monkeypatch.setattr(maintenance_launch.sys, "platform", "win32")
+
+    assert maintenance_launch.restart_desktop_ui()
+    assert captured["args"] == [
+        maintenance_launch.sys.executable,
+        str(maintenance_launch.PATH_ROOT / "desktop_qt_ui" / "main.py"),
+    ]
+    assert captured["kwargs"]["cwd"] == maintenance_launch.PATH_ROOT
+    assert captured["kwargs"]["creationflags"] & maintenance_launch.subprocess.DETACHED_PROCESS
+
+
+def test_automatic_maintenance_restarts_after_update(monkeypatch):
+    events = []
+    monkeypatch.setattr(maintenance_launch, "init_language", lambda: None)
+    monkeypatch.setattr(
+        maintenance_launch,
+        "run_full_update",
+        lambda _args, automatic=False: events.append(("update", automatic)) or True,
+    )
+    monkeypatch.setattr(
+        maintenance_launch,
+        "restart_desktop_ui",
+        lambda: events.append(("restart", True)) or True,
+    )
+
+    maintenance_launch.maintenance_menu(automatic=True)
+
+    assert events == [("update", True), ("restart", True)]