redfetch 1.4.2__tar.gz → 1.4.3__tar.gz

{redfetch-1.4.2 → redfetch-1.4.3}/.github/workflows/pipeline.yml

@@ -107,7 +107,7 @@ jobs:
         id: set_env_vars
         shell: pwsh
         run: |
-          "PYAPP_EXEC_MODULE=redfetch.main" >> $env:GITHUB_ENV
+          "PYAPP_EXEC_SCRIPT=$env:GITHUB_WORKSPACE\pyapp_launcher.py" >> $env:GITHUB_ENV
           "PYAPP_PASS_LOCATION=1" >> $env:GITHUB_ENV
 
           if ($env:GITHUB_REF -eq 'refs/heads/develop') {
@@ -165,11 +165,11 @@ jobs:
             Remove-Item Env:PYAPP_PROJECT_VERSION -ErrorAction SilentlyContinue
           }
 
-          $env:PYAPP_EXEC_MODULE = "${{ env.PYAPP_EXEC_MODULE }}"
+          $env:PYAPP_EXEC_SCRIPT = "${{ env.PYAPP_EXEC_SCRIPT }}"
           $env:PYAPP_PASS_LOCATION = "${{ env.PYAPP_PASS_LOCATION }}"
           $env:PYAPP_PIP_EXTRA_ARGS = "${{ env.PYAPP_PIP_EXTRA_ARGS }}"
 
-          Write-Host "PYAPP_EXEC_MODULE: $env:PYAPP_EXEC_MODULE"
+          Write-Host "PYAPP_EXEC_SCRIPT: $env:PYAPP_EXEC_SCRIPT"
           Write-Host "PYAPP_PASS_LOCATION: $env:PYAPP_PASS_LOCATION"
           Write-Host "PYAPP_PIP_EXTRA_ARGS: $env:PYAPP_PIP_EXTRA_ARGS"
 

{redfetch-1.4.2 → redfetch-1.4.3}/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.3] - 2026-07-06
+
+### Added
+- A failed install will attempt to repair itself, rather than closing immediately.
+
 ## [1.4.2] - 2026-07-06
 
 ### Fixed

{redfetch-1.4.2 → redfetch-1.4.3}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: redfetch
-Version: 1.4.2
+Version: 1.4.3
 Summary: Download and publish EverQuest scripts and software using the RedGuides API
 Project-URL: Homepage, https://www.redguides.com
 Project-URL: Documentation, https://www.redguides.com/community/resources/redfetch.3177/
 Project-URL: Repository, https://github.com/RedGuides/redfetch
 Project-URL: Issues, https://github.com/RedGuides/redfetch/issues
 Project-URL: Changelog, https://github.com/RedGuides/redfetch/blob/main/CHANGELOG.md
-Project-URL: Source_archive, https://github.com/RedGuides/redfetch/archive/38aedc8ce3dc8e7164b3d3c308732461531a7d4a.zip
+Project-URL: Source_archive, https://github.com/RedGuides/redfetch/archive/9161a88b101d6df6ce9a697736e3fcc57b1c3122.zip
 Author-email: Redbot <ask@redguides.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE

redfetch-1.4.3/pyapp_launcher.py

@@ -0,0 +1,99 @@
+"""PyApp entry point for redfetch.exe: run the app, and self-heal a broken install.
+
+PyApp treats half-installed environments as complete, so if something fails or 
+interrupts install, it stays broken unless someone opens a terminal and runs `self restore`. 
+This wrapper runs `self restore` automatically.
+
+Embedded via PYAPP_EXEC_SCRIPT. Stdlib-only, and must not import redfetch at module
+scope, since redfetch is exactly what may be missing!
+"""
+
+import sys
+
+
+def _import_entrypoint():
+    from redfetch.main import main
+    return main
+
+
+# Repair runs after we exit, in a detached script: on Windows `self restore` can't
+# delete the install dir while our python.exe is still running from inside it.
+_REPAIR_BAT = r"""@echo off
+title redfetch - finishing setup
+echo.
+echo   redfetch setup didn't finish!
+echo   Trying to finish it now, this may take a few minutes.
+echo   Please don't close this window.
+echo.
+timeout /t 3 /nobreak > nul
+"<EXE>" self restore
+if %errorlevel% neq 0 goto redfetch_failed
+echo.
+echo   All set -- starting redfetch...
+set "REDFETCH_SELFHEAL=1"
+"<EXE>"
+goto redfetch_cleanup
+:redfetch_failed
+echo.
+echo   Automatic repair didn't complete. You can repair manually by running:
+echo       "<EXE>" self restore
+echo.
+pause
+:redfetch_cleanup
+(goto) 2>nul & del "%~f0"
+"""
+
+
+def _schedule_repair() -> "int | None":
+    """Schedule `self restore` + relaunch; return 0 if scheduled, else None."""
+    import os
+
+    # PYAPP is always set (to "1" when PASS_LOCATION is off), so require a real path.
+    exe = os.environ.get("PYAPP")
+    if sys.platform != "win32" or not exe or not os.path.exists(exe):
+        return None
+    if os.environ.get("REDFETCH_SELFHEAL"):  # already tried once this chain
+        return None
+
+    import subprocess
+    import tempfile
+
+    script = _REPAIR_BAT.replace("<EXE>", exe.replace("%", "%%"))  # %% so cmd won't expand the path
+    path = None
+    try:
+        fd, path = tempfile.mkstemp(prefix="redfetch-repair-", suffix=".bat")
+        with os.fdopen(fd, "w") as handle:
+            handle.write(script)
+        subprocess.Popen(
+            ["cmd.exe", "/c", path],
+            creationflags=subprocess.CREATE_NEW_CONSOLE,
+            close_fds=True,
+        )
+    except Exception:
+        if path:
+            try:
+                os.unlink(path)
+            except OSError:
+                pass
+        return None
+    return 0
+
+
+def main() -> int:
+    try:
+        entrypoint = _import_entrypoint()
+    except ImportError:
+        code = _schedule_repair()
+        if code is None:
+            raise
+        print("redfetch needs to finish setting up; opening a repair window...",
+              file=sys.stderr)
+        return code
+
+    sys.argv[0] = "redfetch"  # so typer's --help shows "redfetch", not this script's path
+    entrypoint()  # errors past here are app logic, not install problems -> don't self-heal
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

{redfetch-1.4.2 → redfetch-1.4.3}/src/redfetch/__about__.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.4.2'
-__version_tuple__ = version_tuple = (1, 4, 2)
+__version__ = version = '1.4.3'
+__version_tuple__ = version_tuple = (1, 4, 3)
 
 __commit_id__ = commit_id = None

{redfetch-1.4.2 → redfetch-1.4.3}/src/redfetch/config.py

@@ -493,3 +493,9 @@ def write_env_to_file(new_env):
         raise RuntimeError("Configuration has not been initialized. Call initialize_config() first.")
 
     env_loader.write(env_file_path, {"REDFETCH_ENV": new_env})
+
+    # Env changed -> re-shows server/config banner.
+    try:
+        os.remove(os.path.join(os.path.dirname(env_file_path), ".banner_shown"))
+    except OSError:
+        pass

{redfetch-1.4.2 → redfetch-1.4.3}/src/redfetch/config_firstrun.py

@@ -4,6 +4,7 @@
 import os
 import platform
 import json
+import time
 
 # Third-party
 from platformdirs import user_config_dir
@@ -21,6 +22,25 @@ from redfetch.detecteq import find_everquest_uninstall_location
 
 console = Console()
 
+# server type and config dir banner
+BANNER_COOLDOWN = 12 * 3600
+
+
+def _banner_due(config_dir):
+    """True unless the banner was shown within the cooldown window."""
+    marker = os.path.join(config_dir, ".banner_shown")
+    try:
+        return (time.time() - os.path.getmtime(marker)) > BANNER_COOLDOWN
+    except OSError:
+        return True
+
+
+def _mark_banner_shown(config_dir):
+    try:
+        open(os.path.join(config_dir, ".banner_shown"), "w").close()
+    except OSError:
+        pass
+
 
 # zork-like prompt
 class CustomPrompt(PromptBase):
@@ -260,7 +280,11 @@ def first_run_setup():
             if pypi_url_override:
                 notice_lines.append(f"[bold yellow]REDFETCH_PYPI_URL:[/bold yellow] {pypi_url_override}")
 
-            console.print(Panel("\n".join(notice_lines), expand=False))
+            # Env overrides always spam the status/config banner.
+            has_overrides = len(notice_lines) > 2
+            if has_overrides or _banner_due(config_dir):
+                console.print(Panel("\n".join(notice_lines), expand=False))
+                _mark_banner_shown(config_dir)
             return config_dir
         else:
             console.print("[bold red]Environment file (.env) not found. Rerunning setup.[/bold red]")

{redfetch-1.4.2 → redfetch-1.4.3}/src/redfetch/main.py

@@ -539,6 +539,9 @@ def config_show_command(server: Optional[Env] = typer.Option(None, "--server", "
     if not panel_lines:
         panel_lines.append("[dim]No paths are currently configured or opted in for this environment.[/dim]")
 
+    # Lead with the server type so users always know which env they're on.
+    panel_lines.insert(0, f"[bold yellow]Server type:[/bold yellow] {current_env}")
+
     console.print(Panel("\n".join(panel_lines), expand=False))
 
     # Optional: Show full settings dict with a label