redfetch 1.4.2__tar.gz → 1.4.4__tar.gz

{redfetch-1.4.2 → redfetch-1.4.4}/.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.4}/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.4] - 2026-07-18
+
+### Fixed
+- A rejected OAuth token will no longer assume you're level 1.
+
+## [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.4}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: redfetch
-Version: 1.4.2
+Version: 1.4.4
 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/d7f95d7be3adeb113e9846081bae4f5764514b72.zip
 Author-email: Redbot <ask@redguides.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE

redfetch-1.4.4/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.4}/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.4'
+__version_tuple__ = version_tuple = (1, 4, 4)
 
 __commit_id__ = commit_id = None

{redfetch-1.4.2 → redfetch-1.4.4}/src/redfetch/auth.py

@@ -499,7 +499,7 @@ async def get_api_headers():
                 if access_token:
                     return {"Authorization": f"Bearer {access_token}"}
 
-            raise RuntimeError("OAuth token refresh failed. Please run `redfetch logout` and authorize again.")
+            raise RuntimeError("OAuth token refresh failed. Restart redfetch to authorize again.")
 
         raise RuntimeError("OAuth access token is expired and no refresh token is available. Please authorize again.")
 

{redfetch-1.4.2 → redfetch-1.4.4}/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.4}/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.4}/src/redfetch/download.py

@@ -104,7 +104,17 @@ async def download_file_async(
         if tmp_path is None:
             return False
 
-        os.replace(tmp_path, file_path)
+        try:
+            displaced = _swap_into_place(tmp_path, file_path)
+        except PermissionError:
+            _report_locked_target(file_path)
+            return False
+        except OSError as e:
+            print(f"Could not update {os.path.basename(file_path)}: {e}")
+            _remove_if_exists(tmp_path)
+            return False
+        if displaced:
+            print(f"Staged update for {os.path.basename(file_path)}; applies on next launch.")
         print(f"Downloaded file {file_path}")
         return True
     finally:

{redfetch-1.4.2 → redfetch-1.4.4}/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.2 → redfetch-1.4.4}/src/redfetch/net.py

@@ -54,8 +54,17 @@ def clear_manifest_cache() -> None:
     reraise=True,
 )
 async def get_json(client: httpx.AsyncClient, url: str, params: Optional[Dict[str, Any]] = None) -> dict:
-    """GET JSON with retry on transient network errors."""
+    """GET JSON with retry on transient network errors and one rejected OAuth token."""
     response = await client.get(url, params=params, timeout=10.0)
+    if response.status_code == 401:
+        scheme, _, token = response.request.headers.get("Authorization", "").partition(" ")
+        if scheme.lower() == "bearer" and token:
+            # The server rejected a token our local expiry still trusts.
+            from redfetch import auth  # lazy: auth imports this module
+
+            auth.set_token_expiry("0")
+            client.headers.update(await auth.get_api_headers())
+            response = await client.get(url, params=params, timeout=10.0)
     response.raise_for_status()
     return response.json()
 

{redfetch-1.4.2 → redfetch-1.4.4}/src/redfetch/terminal_ui.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from itertools import cycle
 
 # third-party
+import httpx
 from dynaconf import ValidationError
 from textual_fspicker import SelectDirectory
 from rich.console import detect_legacy_windows
@@ -314,10 +315,12 @@ class FetchTab(ScrollableContainer):
         app: "Redfetch" = self.app  # type: ignore[assignment]
         if not app.username:
             return  # keep the compose default until identity resolves
-        if app.is_level_2:
+        if app.is_level_2 is True:
             greeting = f"[italic]Hail, [bold]{app.username}![/bold][/italic]"
-        else:
+        elif app.is_level_2 is False:
             greeting = f"Hey {app.username}, you're level 1 😞"
+        else:
+            greeting = f"Hey [bold]{app.username}[/bold]!"
         self.query_one("#welcome_label", Label).update(greeting)
 
     def _recompute(self) -> None:
@@ -911,13 +914,15 @@ class AccountTab(ScrollableContainer):
 
     def _refresh_account_state(self) -> None:
         app: "Redfetch" = self.app  # type: ignore[assignment]
-        self.query_one("#btn_ding", Button).display = not app.is_level_2
+        self.query_one("#btn_ding", Button).display = app.is_level_2 is not True
         if not app.username:
             return  # keep the "Loading..." compose default until the level check resolves
-        if app.is_level_2:
+        if app.is_level_2 is True:
             text = f"[italic][bold]{app.username}, thank you for being level 2[/bold][/italic] 💛"
-        else:
+        elif app.is_level_2 is False:
             text = f"Hey {app.username}, you're level 1 😞 some resources won't be downloaded."
+        else:
+            text = f"Hey {app.username}, we couldn't verify your account level."
         self.query_one("#account_label", Label).update(text)
 
     #
@@ -1023,7 +1028,7 @@ class Redfetch(App):
     current_env: reactive[str] = reactive(config.settings.ENV)
     # User account identity and permissions: set reactively by background workers, observed by AccountTab for live updates
     username: reactive[str] = reactive("")
-    is_level_2: reactive[bool] = reactive(False)
+    is_level_2: reactive[bool | None] = reactive(None)
     # Startup update check: None = unknown, int = resources to be fetched
     update_count: reactive[int | None] = reactive(None)
     # Transient post-sync flash on the Easy Update button
@@ -1919,7 +1924,11 @@ class Redfetch(App):
     @work
     async def load_startup_status(self):
         """Set the account level, the update badge, and print an update summary at startup."""
-        username = await auth.get_username()
+        try:
+            username = await auth.get_username()
+        except RuntimeError:
+            print("Couldn't verify your RedGuides account right now.")
+            return
 
         try:
             headers = await auth.get_api_headers()
@@ -1956,8 +1965,21 @@ class Redfetch(App):
         if os.environ.get("REDFETCH_CRASH_TEST") == "ding":
             raise RuntimeError("Intentional crash test from _check_ding_level_worker.")
 
-        headers = await auth.get_api_headers()
-        sync_info = await api.get_sync_info(headers)
+        try:
+            headers = await auth.get_api_headers()
+            sync_info = await api.get_sync_info(headers)
+        except RuntimeError as exc:
+            # Auth is unrecoverable this session (e.g. token refresh failed).
+            self.notify(str(exc), severity="error", timeout=10)
+            return
+        except (httpx.HTTPStatusError, httpx.RequestError):
+            self.notify(
+                "Couldn't check your account level right now.",
+                severity="error",
+                timeout=10,
+            )
+            return
+
         if sync_info.is_level_2:
             # User is now level 2! AccountTab + FetchTab react to the reactives below.
             self.username = self.username or await auth.get_username()

redfetch-1.4.4/tests/test_oauth_401_recovery.py

@@ -0,0 +1,94 @@
+"""Regression tests: a bearer 401 invalidates the local token expiry and retries once."""
+
+import asyncio
+from unittest.mock import AsyncMock, patch
+
+import httpx
+import pytest
+
+from redfetch import net
+
+
+def _run_get_json(handler, headers):
+    async def go():
+        transport = httpx.MockTransport(handler)
+        async with httpx.AsyncClient(headers=headers, transport=transport) as client:
+            return await net.get_json(client, "https://example.com/api/rgsync")
+    return asyncio.run(go())
+
+
+def test_bearer_401_invalidates_expiry_and_retries_with_fresh_headers():
+    requests: list[httpx.Request] = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        requests.append(request)
+        if len(requests) == 1:
+            return httpx.Response(401, request=request)
+        return httpx.Response(200, json={"ok": True}, request=request)
+
+    fresh_headers = AsyncMock(return_value={"Authorization": "Bearer replacement"})
+    with (
+        patch("redfetch.auth.set_token_expiry") as set_expiry,
+        patch("redfetch.auth.get_api_headers", new=fresh_headers),
+    ):
+        result = _run_get_json(handler, {"Authorization": "Bearer rejected"})
+
+    assert result == {"ok": True}
+    assert [r.headers["Authorization"] for r in requests] == [
+        "Bearer rejected",
+        "Bearer replacement",
+    ]
+    # Zeroing the expiry is what routes get_api_headers() into its refresh path,
+    # and makes authorize() fall through to full auth on the next launch.
+    set_expiry.assert_called_once_with("0")
+
+
+def test_second_401_raises_without_further_retries():
+    requests: list[httpx.Request] = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        requests.append(request)
+        return httpx.Response(401, request=request)
+
+    fresh_headers = AsyncMock(return_value={"Authorization": "Bearer replacement"})
+    with (
+        patch("redfetch.auth.set_token_expiry"),
+        patch("redfetch.auth.get_api_headers", new=fresh_headers),
+        pytest.raises(httpx.HTTPStatusError) as exc_info,
+    ):
+        _run_get_json(handler, {"Authorization": "Bearer rejected"})
+
+    assert exc_info.value.response.status_code == 401
+    assert len(requests) == 2
+
+
+def test_failed_refresh_propagates_runtime_error():
+    """When get_api_headers() can't refresh, its RuntimeError reaches the caller."""
+    def handler(request: httpx.Request) -> httpx.Response:
+        return httpx.Response(401, request=request)
+
+    failed = AsyncMock(side_effect=RuntimeError("OAuth token refresh failed."))
+    with (
+        patch("redfetch.auth.set_token_expiry"),
+        patch("redfetch.auth.get_api_headers", new=failed),
+        pytest.raises(RuntimeError, match="refresh failed"),
+    ):
+        _run_get_json(handler, {"Authorization": "Bearer rejected"})
+
+
+def test_api_key_401_does_not_attempt_oauth_refresh():
+    requests: list[httpx.Request] = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        requests.append(request)
+        return httpx.Response(401, request=request)
+
+    fresh_headers = AsyncMock()
+    with (
+        patch("redfetch.auth.get_api_headers", new=fresh_headers),
+        pytest.raises(httpx.HTTPStatusError),
+    ):
+        _run_get_json(handler, {"XF-Api-Key": "invalid"})
+
+    assert len(requests) == 1
+    fresh_headers.assert_not_awaited()

{redfetch-1.4.2 → redfetch-1.4.4}/tests/test_staged_extraction.py

@@ -1,5 +1,6 @@
 """Tests for two-phase staged extraction: stage every member, then swap all in."""
 
+import asyncio
 import os
 import stat
 import sys
@@ -184,6 +185,54 @@ def test_readonly_target_updated_in_place(tmp_path, monkeypatch):
     assert not list(dest.rglob("*.rfold*"))
 
 
+def test_readonly_target_single_file_download(tmp_path, monkeypatch):
+    # non-zip downloads must share the staged-swap read-only handling
+    # simulate Windows semantics (replace onto RO dst fails) so posix CI pins this too
+    target = tmp_path / "zones.navmesh"
+    target.write_bytes(b"old")
+    os.chmod(target, stat.S_IREAD)
+
+    real_replace = os.replace
+
+    def readonly_replace(src, dst):
+        if os.path.exists(dst) and not os.access(dst, os.W_OK):
+            raise PermissionError("read-only destination")
+        return real_replace(src, dst)
+
+    monkeypatch.setattr(download.os, "replace", readonly_replace)
+
+    async def fake_stream(resp, file_path, hasher):
+        tmp = file_path + ".dl"
+        with open(tmp, "wb") as f:
+            f.write(b"new")
+        return tmp
+
+    monkeypatch.setattr(download, "_stream_to_tempfile", fake_stream)
+
+    class FakeResp:
+        headers = {}
+
+        def raise_for_status(self):
+            pass
+
+    class FakeStream:
+        async def __aenter__(self):
+            return FakeResp()
+
+        async def __aexit__(self, *exc):
+            return False
+
+    class FakeClient:
+        def stream(self, *args, **kwargs):
+            return FakeStream()
+
+    ok = asyncio.run(download.download_file_async(FakeClient(), "http://x", str(target)))
+
+    assert ok is True
+    assert target.read_bytes() == b"new"
+    assert not list(tmp_path.rglob("*.rfold*"))
+
+
 def test_remove_if_exists_clears_readonly(tmp_path, monkeypatch):
     # displaced .rfold files keep the read-only bit; sweep must still delete them.
     # simulate Windows semantics (unlink of RO file fails) so posix CI pins this too