relaunch after PYAPP self-update from win explorer

Author: Redbot

src/redfetch/main.py

@@ -39,6 +39,19 @@ class Env(str, Enum):
     EMU = "EMU"
 
 
+def should_relaunch_after_pyapp_update() -> bool:
+    """Relaunch after a PYAPP self-update only for double-click/Explorer launches."""
+    if sys.platform != "win32" or not os.getenv("PYAPP"):
+        return False
+    try:
+        import psutil  # type: ignore
+
+        parent = psutil.Process().parent()
+        return bool(parent and parent.name().lower() == "explorer.exe")
+    except Exception:
+        return False
+
+
 def parse_resource_id_or_fail(value: str) -> str:
     """Accept either an integer ID or a URL that includes a recognizable ID."""
     value_stripped = value.strip()
@@ -274,7 +287,7 @@ def run_tui():
     # Initialize config early; terminal_ui accesses config at import time
     config.initialize_config()
     if os.environ.get('CI') != 'true':
-        _ = meta.check_for_update()
+        _ = meta.check_for_update(relaunch=should_relaunch_after_pyapp_update())
     # Ensure the user is authorized before launching UI
     auth.initialize_keyring()
     auth.authorize()

src/redfetch/meta.py

@@ -4,6 +4,7 @@
 import subprocess
 import sys
 import textwrap
+import tempfile
 from pathlib import Path
 
 # Third-party
@@ -166,7 +167,7 @@ def get_update_command():
     return commands.get(method)
 
 
-def check_for_update():
+def check_for_update(relaunch: bool = False):
     current_version = get_current_version()
 
     try:
@@ -189,7 +190,7 @@ def check_for_update():
             # Handle PYAPP separately
             if os.getenv('PYAPP'):
                 if Confirm.ask("Would you like to update now?"):
-                    return self_update()
+                    return self_update(relaunch=relaunch)
                 else:
                     console.print("[yellow]Update skipped. You can manually update later.[/yellow]")
                 return False
@@ -236,7 +237,7 @@ def pip_update_redfetch(update_command, latest_version):
         sys.exit(1)
 
 
-def self_update():
+def self_update(relaunch: bool = False):
     """Update with PYAPP."""
     try:
         console.print("[bold]Performing self-update...[/bold]")
@@ -249,11 +250,33 @@ def self_update():
         executable_path = get_executable_path()
         update_command = [executable_path, 'self', 'update']
 
-        # Start the update process in a new console and exit the current one
-        subprocess.Popen(
-            update_command,
-            creationflags=subprocess.CREATE_NEW_CONSOLE
-        )
+        if relaunch and sys.platform == "win32":
+            update_cmdline = subprocess.list2cmdline(update_command)
+            relaunch_cmdline = subprocess.list2cmdline([executable_path])
+            batch_script = textwrap.dedent(f"""
+            @echo off
+            {update_cmdline}
+            if %errorlevel% neq 0 (
+                echo Update failed. Press any key to exit.
+                pause > nul
+                exit /b %errorlevel%
+            )
+            {relaunch_cmdline}
+            (goto) 2>nul & del "%~f0"
+            """).strip()
+            with tempfile.NamedTemporaryFile(
+                mode="w",
+                delete=False,
+                suffix=".bat",
+                encoding="utf-8"
+            ) as batch_file:
+                batch_file.write(batch_script)
+
+            subprocess.Popen(["cmd.exe", "/c", batch_file.name])
+            sys.exit(0)
+
+        # Start the update process and exit the current one
+        subprocess.Popen(update_command)
 
         # Exit the current process to allow the update to proceed
         sys.exit(0)