redfetch 1.4.1__tar.gz → 1.4.3__tar.gz

{redfetch-1.4.1 → 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.1 → redfetch-1.4.3}/CHANGELOG.md

@@ -5,6 +5,16 @@ 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
+- The update button wouldn't launch MQ if eqbcs.exe was running.
+
 ## [1.4.1] - 2026-07-05
 
 ### Changed

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: redfetch
-Version: 1.4.1
+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/6c3be23e13fb9b1cb6eed3c065b930111c484175.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.1 → 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.1'
-__version_tuple__ = version_tuple = (1, 4, 1)
+__version__ = version = '1.4.3'
+__version_tuple__ = version_tuple = (1, 4, 3)
 
 __commit_id__ = commit_id = None

{redfetch-1.4.1 → 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.1 → 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.1 → 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

{redfetch-1.4.1 → redfetch-1.4.3}/src/redfetch/processes.py

@@ -1,6 +1,7 @@
 """Helpers for managing external processes."""
 from __future__ import annotations
 
+import configparser
 import os
 import subprocess
 import sys
@@ -95,22 +96,20 @@ def is_executable_running(exe_path: str, running: set[str] | None = None) -> boo
 
 
 def _spawned_loader_name(mq_folder: str) -> str | None:
-    """Loader-copy filename from MacroQuest.ini [Internal] SpawnedProcess."""
-    ini_path = os.path.join(mq_folder, "MacroQuest.ini")
-    try:
-        with open(ini_path, encoding="utf-8", errors="ignore") as fh:
-            in_internal = False
-            for line in fh:
-                stripped = line.strip()
-                if stripped.startswith("["):
-                    in_internal = stripped.lower() == "[internal]"
-                    continue
-                if in_internal and "=" in stripped:
-                    key, _, value = stripped.partition("=")
-                    if key.strip().lower() == "spawnedprocess":
-                        return value.strip() or None
-    except OSError:
-        pass
+    """Loader-copy filename from MacroQuest.ini."""
+    for ini_path in (
+        os.path.join(mq_folder, "config", "MacroQuest.ini"),
+        os.path.join(mq_folder, "MacroQuest.ini"),
+    ):
+
+        parser = configparser.ConfigParser(interpolation=None, strict=False)
+        try:
+            parser.read(ini_path, encoding="utf-8")
+            name = parser.get("Internal", "SpawnedProcess", fallback="").strip()
+        except (configparser.Error, OSError):
+            continue
+        if name:
+            return name
     return None
 
 
@@ -136,13 +135,12 @@ def macroquest_session_running(mq_folder: str, running: set[str] | None = None)
     if running is None:
         running = running_executable_paths()
     folder = _norm(mq_folder)
+    alias = _spawned_loader_name(mq_folder)
+    alias = alias.lower() if alias else None
     for path in running:
-        if os.path.dirname(path) == folder and os.path.basename(path) != "eqbcs.exe":
+        base = os.path.basename(path)
+        if base == alias or (base == "macroquest.exe" and os.path.dirname(path) == folder):
             return True
-    spawned = _spawned_loader_name(mq_folder)
-    if spawned:
-        spawned = spawned.lower()
-        return any(os.path.basename(path) == spawned for path in running)
     return False
 
 

{redfetch-1.4.1 → redfetch-1.4.3}/tests/cli_reference.py

@@ -5,7 +5,7 @@ changing a command or option, refresh the docs:
 
     hatch run dev:gen-docs          # or: python tests/cli_reference.py --write
 
-``test_readme_cli_reference.py`` fails if README.md drifts from this output.
+Run ``hatch run dev:check-docs`` in CI or before release to catch drift.
 """
 from __future__ import annotations
 

{redfetch-1.4.1 → redfetch-1.4.3}/tests/test_close_gating.py

@@ -194,10 +194,11 @@ def _norm_set(*paths):
     return {os.path.normcase(os.path.normpath(p)) for p in paths}
 
 
-def test_session_running_detects_loader_copy_in_folder(tmp_path, monkeypatch):
+def test_session_ignores_unrecorded_exe_in_folder(tmp_path, monkeypatch):
+    # With no loader recorded (fresh install), a stray exe in the folder is NOT a session.
     monkeypatch.setattr(processes, "_spawned_loader_name", lambda folder: None)
     running = _norm_set(str(tmp_path / "LV3XGukn.exe"))
-    assert processes.macroquest_session_running(str(tmp_path), running) is True
+    assert processes.macroquest_session_running(str(tmp_path), running) is False
 
 
 @windows_paths
@@ -222,6 +223,39 @@ def test_session_not_running_when_nothing_matches(tmp_path, monkeypatch):
     assert processes.macroquest_session_running(str(tmp_path), running) is False
 
 
+@windows_paths
+def test_session_ignores_renamed_eqbcs_copy_when_loader_not_running(tmp_path, monkeypatch):
+    # The reported bug: EQBCS runs as a random-named RunFromTemp copy next to MQ and survives it.
+    monkeypatch.setattr(processes, "_spawned_loader_name", lambda folder: "LV3XGukn.exe")
+    running = _norm_set(str(tmp_path / "wUUayFYjXM.exe"))  # an EQBCS copy; loader not running
+    assert processes.macroquest_session_running(str(tmp_path), running) is False
+
+
+@windows_paths
+def test_session_matches_recorded_loader_amid_other_folder_exes(tmp_path, monkeypatch):
+    # The recorded loader name is authoritative: MQ is up when that copy runs, whatever else
+    # (LootSort, MeshGenerator, an EQBCS copy...) happens to share the folder.
+    monkeypatch.setattr(processes, "_spawned_loader_name", lambda folder: "LV3XGukn.exe")
+    running = _norm_set(str(tmp_path / "LV3XGukn.exe"), str(tmp_path / "LootSort.exe"))
+    assert processes.macroquest_session_running(str(tmp_path), running) is True
+
+
+@windows_paths
+def test_session_ignores_folder_tools_when_loader_recorded(tmp_path, monkeypatch):
+    # A folder tool running is not a session when a loader name is recorded and its process is gone.
+    monkeypatch.setattr(processes, "_spawned_loader_name", lambda folder: "LV3XGukn.exe")
+    running = _norm_set(str(tmp_path / "LootSort.exe"))
+    assert processes.macroquest_session_running(str(tmp_path), running) is False
+
+
+@windows_paths
+def test_session_detects_macroquest_exe_direct(tmp_path, monkeypatch):
+    # RunFromTemp off: MacroQuest.exe runs directly from the folder -> unambiguously a session.
+    monkeypatch.setattr(processes, "_spawned_loader_name", lambda folder: None)
+    running = _norm_set(str(tmp_path / "MacroQuest.exe"))
+    assert processes.macroquest_session_running(str(tmp_path), running) is True
+
+
 def test_spawned_loader_name_parsed_from_ini(tmp_path):
     (tmp_path / "MacroQuest.ini").write_text(
         "[Other]\nSpawnedProcess=wrong.exe\n[Internal]\nSpawnedProcess=Ab12Cd34.exe\n"
@@ -230,6 +264,14 @@ def test_spawned_loader_name_parsed_from_ini(tmp_path):
     assert processes._spawned_loader_name(str(tmp_path / "missing")) is None
 
 
+def test_spawned_loader_name_prefers_config_subfolder(tmp_path):
+    # Current MQ writes its INI under config/; the reader must look there, and it wins over root.
+    (tmp_path / "config").mkdir()
+    (tmp_path / "config" / "MacroQuest.ini").write_text("[Internal]\nSpawnedProcess=fromconfig.exe\n")
+    (tmp_path / "MacroQuest.ini").write_text("[Internal]\nSpawnedProcess=fromroot.exe\n")
+    assert processes._spawned_loader_name(str(tmp_path)) == "fromconfig.exe"
+
+
 # --- terminate/restart hardening --------------------------------------------------------
 
 def test_terminate_reports_hung_process_and_continues(fake_windows):

{redfetch-1.4.1 → redfetch-1.4.3}/tests/test_self_heal_eqpath.py

@@ -1,9 +1,4 @@
-"""config.self_heal_eqpath fills a blank/stale EQPATH from MacroQuest autologin at startup.
-
-Covers the empty-or-invalid heal policy: heal when EQPATH is blank or its folder is gone,
-never clobber a valid deliberate value, and keep one env's failure from aborting the others.
-The @format linchpin test proves the payoff: a stored EQPATH makes maps resolve to <eq>/maps.
-"""
+"""config.self_heal_eqpath fills a blank/stale EQPATH from MacroQuest autologin at startup."""
 import os
 import sqlite3
 
@@ -138,7 +133,6 @@ def test_no_login_db_no_heal(tmp_path, spy, monkeypatch):
 
     assert spy == []
 
-
 def test_only_blank_env_heals(tmp_path, eq_dir, spy, monkeypatch):
     vvmq = _make_vvmq(tmp_path, "vvmq_live", "live", eq_dir)
     envs = {
@@ -169,11 +163,7 @@ def test_exception_in_one_env_does_not_abort_others(tmp_path, eq_dir, spy, monke
 # --- the @format linchpin ---------------------------------------------------
 
 def test_maps_resolve_under_stored_eqpath(tmp_path, monkeypatch):
-    """A stored EQPATH (where the heal writes it) makes maps resource 153 resolve to <eq>/maps.
-
-    This is the whole point of self-heal over the old read-through: fix the stored value once
-    and every `@format {this.eqpath}` consumer lights up for free.
-    """
+    """A stored EQPATH (where the heal writes it) makes maps resource 153 resolve to <eq>/maps."""
     from dynaconf import Dynaconf
     from redfetch import sync_discovery
 
@@ -196,3 +186,4 @@ def test_maps_resolve_under_stored_eqpath(tmp_path, monkeypatch):
 
     resolved = sync_discovery.resolve_root_path("153", None, "LIVE")
     assert resolved == os.path.normpath(str(eq / "maps"))
+

redfetch-1.4.1/tests/test_readme_cli_reference.py

@@ -1,36 +0,0 @@
-"""Guard against README drift: the Command Line Reference is generated from the
-typer app (see cli_reference.py). This fails if README.md is out of date, i.e.
-someone changed a command/option in main.py but didn't regenerate the docs.
-
-Fix a failure with:  hatch run dev:gen-docs
-"""
-import difflib
-import sys
-from pathlib import Path
-
-sys.path.insert(0, str(Path(__file__).resolve().parent))  # import the sibling helper
-
-from cli_reference import README, current_block, render_reference
-
-
-def test_readme_cli_reference_is_current():
-    readme = README.read_text(encoding="utf-8")
-    block = current_block(readme)
-    assert block is not None, (
-        "CLI reference markers are missing from README.md. Restore them and run "
-        "`hatch run dev:gen-docs`."
-    )
-
-    expected = render_reference()
-    if block != expected:
-        diff = "\n".join(
-            difflib.unified_diff(
-                block.splitlines(), expected.splitlines(),
-                fromfile="README.md (committed)", tofile="generated from main.py",
-                lineterm="",
-            )
-        )
-        raise AssertionError(
-            "README.md Command Line Reference is stale. Regenerate with "
-            "`hatch run dev:gen-docs` (command help lives in src/redfetch/main.py).\n" + diff
-        )