redfetch 1.3.0__tar.gz → 1.4.1__tar.gz

{redfetch-1.3.0 → redfetch-1.4.1}/.github/workflows/pipeline.yml

@@ -60,6 +60,13 @@ jobs:
         run: |
           hatch build
 
+      - name: Upload Python distribution
+        if: github.ref == 'refs/heads/develop'
+        uses: actions/upload-artifact@v7
+        with:
+          name: python-dist
+          path: dist/
+
       - name: Get Version
         id: get_version
         run: |
@@ -89,22 +96,26 @@ jobs:
         with:
           fetch-depth: 0  # Ensure full Git history is available for versioning
 
+      - name: Download Python distribution
+        if: github.ref == 'refs/heads/develop'
+        uses: actions/download-artifact@v8
+        with:
+          name: python-dist
+          path: dist
+
       - name: Set Environment Variables
         id: set_env_vars
         shell: pwsh
         run: |
-          # Set static environment variables
-          "PYAPP_PROJECT_NAME=redfetch" >> $env:GITHUB_ENV
           "PYAPP_EXEC_MODULE=redfetch.main" >> $env:GITHUB_ENV
           "PYAPP_PASS_LOCATION=1" >> $env:GITHUB_ENV
 
-          # Conditionally set PYAPP_PIP_EXTRA_ARGS based on the branch or tag
           if ($env:GITHUB_REF -eq 'refs/heads/develop') {
-            $pipArgs = "--index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/"
+            "PYAPP_EMBED_WHEEL=1" >> $env:GITHUB_ENV
           } else {
-            $pipArgs = ""
+            "PYAPP_PROJECT_NAME=redfetch" >> $env:GITHUB_ENV
           }
-          "PYAPP_PIP_EXTRA_ARGS=$pipArgs" >> $env:GITHUB_ENV
+          "PYAPP_PIP_EXTRA_ARGS=" >> $env:GITHUB_ENV
 
           # Output the values for verification
           Get-Content $env:GITHUB_ENV
@@ -145,18 +156,23 @@ jobs:
 
       - name: Build PyApp Executable
         run: |
-          $env:PYAPP_PROJECT_NAME = "${{ env.PYAPP_PROJECT_NAME }}"
+          if ($env:PYAPP_EMBED_WHEEL -eq '1') {
+            # Develop embeds the built wheel so its deps resolve from PyPI rather than TestPyPI
+            $wheel = Get-ChildItem -Path "$env:GITHUB_WORKSPACE\dist\*.whl" | Select-Object -First 1
+            if (-not $wheel) { throw "No redfetch wheel found in dist/" }
+            $env:PYAPP_PROJECT_PATH = $wheel.FullName
+            Remove-Item Env:PYAPP_PROJECT_NAME -ErrorAction SilentlyContinue
+            Remove-Item Env:PYAPP_PROJECT_VERSION -ErrorAction SilentlyContinue
+          }
+
           $env:PYAPP_EXEC_MODULE = "${{ env.PYAPP_EXEC_MODULE }}"
           $env:PYAPP_PASS_LOCATION = "${{ env.PYAPP_PASS_LOCATION }}"
           $env:PYAPP_PIP_EXTRA_ARGS = "${{ env.PYAPP_PIP_EXTRA_ARGS }}"
-          $env:PYAPP_PROJECT_VERSION = "${{ env.PYAPP_PROJECT_VERSION }}"
-          
-          Write-Host "PYAPP_PROJECT_NAME: $env:PYAPP_PROJECT_NAME"
+
           Write-Host "PYAPP_EXEC_MODULE: $env:PYAPP_EXEC_MODULE"
           Write-Host "PYAPP_PASS_LOCATION: $env:PYAPP_PASS_LOCATION"
           Write-Host "PYAPP_PIP_EXTRA_ARGS: $env:PYAPP_PIP_EXTRA_ARGS"
-          Write-Host "PYAPP_PROJECT_VERSION: $env:PYAPP_PROJECT_VERSION"
-          
+
           cargo build --release
         working-directory: .\pyapp-latest
         shell: pwsh

{redfetch-1.3.0 → redfetch-1.4.1}/.gitignore

@@ -7,6 +7,10 @@ __pycache__/
 #virtual environments
 env/
 venv/
+.venv/
+
+# uv (project is hatch-managed)
+uv.lock
 
 # Downloaded files
 Downloads/

redfetch-1.4.1/AGENTS.md

@@ -0,0 +1,21 @@
+# AGENTS.md
+
+**redfetch** — a CLI/TUI for downloading and publishing MacroQuest and EverQuest scripts and software via the RedGuides API.
+
+## Running tests
+
+Use `hatch test` — not `pytest`, `uv`, or an ad-hoc venv
+
+```sh
+hatch test                       # full suite
+hatch test tests/test_check.py   # single file
+```
+## Libraries
+
+- [Textual](https://textual.textualize.io/) - TUI
+- [Hatch](https://hatch.pypa.io/latest/) - Build system
+- [PYPA](https://www.pypa.io/en/latest/specifications/) - Package index
+
+## Conventions
+
+- Use the `dev` environment (`hatch shell dev`) for development

{redfetch-1.3.0 → redfetch-1.4.1}/CHANGELOG.md

@@ -5,6 +5,25 @@ 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.1] - 2026-07-05
+
+### Changed
+- The update button once again doubles as a *launch MQ* button, even when no update occurs.
+
+### Added
+- `redfetch run` and `redfetch open` CLI commands act as shortcuts, for example `redfetch run eqgame` will start EQgame.exe, `redfetch open eqhost` will open the eqhost.txt file, etc. These mirror the TUI shortcuts.
+
+## [1.4.0] - 2026-07-05
+
+### Changed
+- You can now update while playing. Updates take effect the next time you start Very Vanilla MQ.
+
+### Added
+- New logic for restarting VVMQ after an update. redfetch will never touch EQ nor unload MQ.
+
+### Removed
+- The "Close MQ pre-update" setting and TUI toggle.
+
 ## [1.3.0] - 2026-06-26
 
 ### Added

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: redfetch
-Version: 1.3.0
+Version: 1.4.1
 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/aaf2d42ab82d45abeadfafa943e2b61abba2cb60.zip
+Project-URL: Source_archive, https://github.com/RedGuides/redfetch/archive/6c3be23e13fb9b1cb6eed3c065b930111c484175.zip
 Author-email: Redbot <ask@redguides.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE
@@ -21,9 +21,10 @@ Requires-Python: >=3.12
 Requires-Dist: aiofiles~=25.1
 Requires-Dist: aiohttp~=3.14
 Requires-Dist: aiosqlite~=0.22
-Requires-Dist: cachetools~=7.1
 Requires-Dist: diskcache~=5.6
-Requires-Dist: dynaconf<3.3,~=3.2
+Requires-Dist: dynaconf>=3.3.2,~=3.3
+Requires-Dist: filelock~=3.29
+Requires-Dist: hishel[async,httpx]~=1.3
 Requires-Dist: httpx[http2]~=0.28
 Requires-Dist: keepachangelog~=2.0
 Requires-Dist: keyring~=25.7
@@ -32,7 +33,6 @@ Requires-Dist: packaging~=26.2
 Requires-Dist: platformdirs~=4.10
 Requires-Dist: psutil~=7.2
 Requires-Dist: pydantic~=2.13
-Requires-Dist: pyperclip~=1.11
 Requires-Dist: pywin32; sys_platform == 'win32'
 Requires-Dist: rich~=15.0
 Requires-Dist: tenacity~=9.1
@@ -105,42 +105,56 @@ To run redfetch from the command line:
 
 ## Command Line Reference
 
-> Run `redfetch --help` or `.\redfetch.exe --help` to see something like this in your terminal:
-> 
+<!-- BEGIN GENERATED CLI REFERENCE -->
+> Run `redfetch --help` for the current list, or `redfetch <COMMAND> --help` for a command's options. It looks like:
+>
 > ### 📦 Resource Management
-> - `update` - Update all watched and special resources
->   - `--force` / `-f` - Force re-download of all watched resources
->   - `--server` / `-s` - Switch to this server before updating (`LIVE`, `TEST`, `EMU`)
-> - `download <ID_OR_URL>` - Download a specific resource by ID or URL
->   - `--force` / `-f` - Force re-download by resetting this resource's download date
->   - `--server` / `-s` - Switch to this server before downloading (`LIVE`, `TEST`, `EMU`)
-> - `list` - List resources and dependencies in the cache database
-> - `reset` - Reset download dates for watched resources
-> 
+> - `update` - Update all *watched* and special resources.
+>   - `--force` / `-f` - Force re-download of all watched resources.
+>   - `--server` / `-s` - Update this server for this run only, without changing your current server (LIVE, TEST, EMU).
+> - `download <ID_OR_URL>` - Download a specific resource by ID or URL.
+>   - `ID_OR_URL` - RedGuides resource ID or URL
+>   - `--force` / `-f` - Force re-download by resetting this resource's download date.
+>   - `--server` / `-s` - Download from this server for this run only, without changing your current server (LIVE, TEST, EMU).
+> - `check` - Non-interactive update check (for automation.)
+>   - `--server` / `-s` - Check this server's env for this run only, without persisting it (LIVE, TEST, EMU).
+> - `list` - List resources and dependencies in your local cache.
+> - `reset` - Reset download dates for *watched resources* in the database.
+>
+> ### 🔧 System & Utilities
+> - `ui` - Launch the *Terminal User Interface*.
+> - `run [SHORTCUT]` - Run a shortcut (e.g. **vvmq**, **eqbcs**, **myseq**). **run** by itself will show a full list.
+>   - `SHORTCUT` - Shortcut to run: vvmq, eqbcs, eq, eqgame, etc.
+>   - `--server` / `-s` - Run for this server this run only, without changing your current server (LIVE, TEST, EMU).
+> - `open [SHORTCUT]` - Open a folder or file (e.g. **downloads**, **eqhost**). **open** by itself will show a full list.
+>   - `SHORTCUT` - Folder/file to open: downloads, vvmq, eq, etc.
+>   - `--server` / `-s` - Resolve paths for this server this run only, without changing your current server (LIVE, TEST, EMU).
+> - `web` - Launch the **RedGuides.com** web interface.
+> - `version` - Show version and exit.
+> - `uninstall` - Uninstall **redfetch** and clean up data.
+> - `logout` - Log out and clear cached token and API cache.
+>
 > ### 🍔 Configuration
-> - `server <SERVER>` - Switch the current server/environment to `LIVE`, `TEST`, or `EMU`
-> - `config <SETTING_PATH> <VALUE>` - Update a setting by path and value
->   - `SETTING_PATH` - Dot-separated setting path (e.g., `SPECIAL_RESOURCES.1974.opt_in`)
+> - `config <SETTING_PATH> <VALUE>` - Update a setting by path and value.
+>   - `SETTING_PATH` - Dot-separated setting path (e.g., SPECIAL_RESOURCES.1974.opt_in)
 >   - `VALUE` - New value for the setting
->   - `--server` / `-s` - Server to apply the change in (`LIVE`, `TEST`, `EMU`)
-> - `status` - Show the configuration for the current or specified server
+>   - `--server` / `-s` - Server to apply the change in (LIVE, TEST, EMU)
+> - `server <SERVER>` - Switch the current server/environment to LIVE, TEST, or EMU.
+>   - `SERVER` - Server to use: LIVE, TEST, EMU
+> - `status` - Show the configuration for the current or specified server.
 >   - `--server` / `-s` - Server to show (defaults to current)
-> 
-> ### 🔧 System & Utilities
-> - `ui` - Launch the Terminal User Interface
-> - `web` - Launch the RedGuides.com web interface
-> - `version` - Show version and exit
-> - `logout` - Disconnect your account from redfetch
-> - `uninstall` - Uninstall redfetch and clean up data
-> 
+>
 > ### 📤 Publishing
-> - `publish <resource_id>` - Publish an update to you or your team's resource. [There's also a github action for this.](https://github.com/marketplace/actions/redguides-publish)
->   - `resource_id` - Existing RedGuides resource ID
->   - `--description <README.md>` / `-d` - Path to a file (e.g. `README.md`) that will become the resource's overview description
->   - `--version <version_number>` / `-v` - New version string (e.g., `v1.0.1`)
->   - `--message <CHANGELOG.md | MESSAGE>` / `-m` - Version update message, a message file (e.g. `message.md` / `message.txt`), or a `CHANGELOG.md` (keep a changelog) file.
+> - `publish <RESOURCE_ID>` - Publish updates to a **RedGuides** resource.
+>   - `RESOURCE_ID` - Existing RedGuides resource ID
+>   - `--description <README.md>` / `-d` - Path to a description file (e.g. README.md) to become the overview description.
+>   - `--version` / `-v` - New version string (e.g., v1.0.1)
+>   - `--message <CHANGELOG.md | MESSAGE>` / `-m` - Path to *CHANGELOG.md* (keep a changelog), other message file, or a direct message string.
 >   - `--file <FILE.zip>` / `-f` - Path to your zipped release file
->   - `--domain <URL>` - Domain to prepend to relative URLs in README.md or CHANGELOG.md files. (mostly for images. e.g., `https://raw.githubusercontent.com/yourusername/yourrepo/main/`)
+>   - `--domain` - If description or message is a .md file with relative URLs, resolve them to this domain (e.g., https://raw.githubusercontent.com/your/repo/main/)
+<!-- END GENERATED CLI REFERENCE -->
+
+The `publish` command also has a [GitHub Action](https://github.com/marketplace/actions/redguides-publish).
 
 ## Settings
 
@@ -163,7 +177,7 @@ opt_in = true
 ```
 * Note the use of single quotes around the path, which are required for windows paths.
 
-The above will install Brewall's maps to the EQ maps directory the next time `--download-watched` is run for `LIVE` servers.
+The above will install Brewall's maps to the EQ maps directory the next time `redfetch update` is run for `LIVE` servers.
 
 ### Overwrite protection
 
@@ -220,14 +234,6 @@ command = ["C:\\Users\\Public\\Python\\python.exe", "C:\\Users\\Public\\redfetch
 
 You can set these per-server, e.g. `[TEST.POST_UPDATE_LAUNCH]`, or global `[DEFAULT.POST_UPDATE_LAUNCH]`.
 
-
-## Trailmap
-- Add custom buttons for "fetch" tab.
-- Option: Close after update
-- Indicate when updated VV is available
-- Run from MQ
-- Deeper integration with the forums
-
 ![Watchers on RedGuides](https://www.redguides.com/community/resources/redfetch.3177/watchers-sparkline?months=12&w=500&h=180)
 
 ## Contributing

{redfetch-1.3.0 → redfetch-1.4.1}/README.md

@@ -61,42 +61,56 @@ To run redfetch from the command line:
 
 ## Command Line Reference
 
-> Run `redfetch --help` or `.\redfetch.exe --help` to see something like this in your terminal:
-> 
+<!-- BEGIN GENERATED CLI REFERENCE -->
+> Run `redfetch --help` for the current list, or `redfetch <COMMAND> --help` for a command's options. It looks like:
+>
 > ### 📦 Resource Management
-> - `update` - Update all watched and special resources
->   - `--force` / `-f` - Force re-download of all watched resources
->   - `--server` / `-s` - Switch to this server before updating (`LIVE`, `TEST`, `EMU`)
-> - `download <ID_OR_URL>` - Download a specific resource by ID or URL
->   - `--force` / `-f` - Force re-download by resetting this resource's download date
->   - `--server` / `-s` - Switch to this server before downloading (`LIVE`, `TEST`, `EMU`)
-> - `list` - List resources and dependencies in the cache database
-> - `reset` - Reset download dates for watched resources
-> 
+> - `update` - Update all *watched* and special resources.
+>   - `--force` / `-f` - Force re-download of all watched resources.
+>   - `--server` / `-s` - Update this server for this run only, without changing your current server (LIVE, TEST, EMU).
+> - `download <ID_OR_URL>` - Download a specific resource by ID or URL.
+>   - `ID_OR_URL` - RedGuides resource ID or URL
+>   - `--force` / `-f` - Force re-download by resetting this resource's download date.
+>   - `--server` / `-s` - Download from this server for this run only, without changing your current server (LIVE, TEST, EMU).
+> - `check` - Non-interactive update check (for automation.)
+>   - `--server` / `-s` - Check this server's env for this run only, without persisting it (LIVE, TEST, EMU).
+> - `list` - List resources and dependencies in your local cache.
+> - `reset` - Reset download dates for *watched resources* in the database.
+>
+> ### 🔧 System & Utilities
+> - `ui` - Launch the *Terminal User Interface*.
+> - `run [SHORTCUT]` - Run a shortcut (e.g. **vvmq**, **eqbcs**, **myseq**). **run** by itself will show a full list.
+>   - `SHORTCUT` - Shortcut to run: vvmq, eqbcs, eq, eqgame, etc.
+>   - `--server` / `-s` - Run for this server this run only, without changing your current server (LIVE, TEST, EMU).
+> - `open [SHORTCUT]` - Open a folder or file (e.g. **downloads**, **eqhost**). **open** by itself will show a full list.
+>   - `SHORTCUT` - Folder/file to open: downloads, vvmq, eq, etc.
+>   - `--server` / `-s` - Resolve paths for this server this run only, without changing your current server (LIVE, TEST, EMU).
+> - `web` - Launch the **RedGuides.com** web interface.
+> - `version` - Show version and exit.
+> - `uninstall` - Uninstall **redfetch** and clean up data.
+> - `logout` - Log out and clear cached token and API cache.
+>
 > ### 🍔 Configuration
-> - `server <SERVER>` - Switch the current server/environment to `LIVE`, `TEST`, or `EMU`
-> - `config <SETTING_PATH> <VALUE>` - Update a setting by path and value
->   - `SETTING_PATH` - Dot-separated setting path (e.g., `SPECIAL_RESOURCES.1974.opt_in`)
+> - `config <SETTING_PATH> <VALUE>` - Update a setting by path and value.
+>   - `SETTING_PATH` - Dot-separated setting path (e.g., SPECIAL_RESOURCES.1974.opt_in)
 >   - `VALUE` - New value for the setting
->   - `--server` / `-s` - Server to apply the change in (`LIVE`, `TEST`, `EMU`)
-> - `status` - Show the configuration for the current or specified server
+>   - `--server` / `-s` - Server to apply the change in (LIVE, TEST, EMU)
+> - `server <SERVER>` - Switch the current server/environment to LIVE, TEST, or EMU.
+>   - `SERVER` - Server to use: LIVE, TEST, EMU
+> - `status` - Show the configuration for the current or specified server.
 >   - `--server` / `-s` - Server to show (defaults to current)
-> 
-> ### 🔧 System & Utilities
-> - `ui` - Launch the Terminal User Interface
-> - `web` - Launch the RedGuides.com web interface
-> - `version` - Show version and exit
-> - `logout` - Disconnect your account from redfetch
-> - `uninstall` - Uninstall redfetch and clean up data
-> 
+>
 > ### 📤 Publishing
-> - `publish <resource_id>` - Publish an update to you or your team's resource. [There's also a github action for this.](https://github.com/marketplace/actions/redguides-publish)
->   - `resource_id` - Existing RedGuides resource ID
->   - `--description <README.md>` / `-d` - Path to a file (e.g. `README.md`) that will become the resource's overview description
->   - `--version <version_number>` / `-v` - New version string (e.g., `v1.0.1`)
->   - `--message <CHANGELOG.md | MESSAGE>` / `-m` - Version update message, a message file (e.g. `message.md` / `message.txt`), or a `CHANGELOG.md` (keep a changelog) file.
+> - `publish <RESOURCE_ID>` - Publish updates to a **RedGuides** resource.
+>   - `RESOURCE_ID` - Existing RedGuides resource ID
+>   - `--description <README.md>` / `-d` - Path to a description file (e.g. README.md) to become the overview description.
+>   - `--version` / `-v` - New version string (e.g., v1.0.1)
+>   - `--message <CHANGELOG.md | MESSAGE>` / `-m` - Path to *CHANGELOG.md* (keep a changelog), other message file, or a direct message string.
 >   - `--file <FILE.zip>` / `-f` - Path to your zipped release file
->   - `--domain <URL>` - Domain to prepend to relative URLs in README.md or CHANGELOG.md files. (mostly for images. e.g., `https://raw.githubusercontent.com/yourusername/yourrepo/main/`)
+>   - `--domain` - If description or message is a .md file with relative URLs, resolve them to this domain (e.g., https://raw.githubusercontent.com/your/repo/main/)
+<!-- END GENERATED CLI REFERENCE -->
+
+The `publish` command also has a [GitHub Action](https://github.com/marketplace/actions/redguides-publish).
 
 ## Settings
 
@@ -119,7 +133,7 @@ opt_in = true
 ```
 * Note the use of single quotes around the path, which are required for windows paths.
 
-The above will install Brewall's maps to the EQ maps directory the next time `--download-watched` is run for `LIVE` servers.
+The above will install Brewall's maps to the EQ maps directory the next time `redfetch update` is run for `LIVE` servers.
 
 ### Overwrite protection
 
@@ -176,14 +190,6 @@ command = ["C:\\Users\\Public\\Python\\python.exe", "C:\\Users\\Public\\redfetch
 
 You can set these per-server, e.g. `[TEST.POST_UPDATE_LAUNCH]`, or global `[DEFAULT.POST_UPDATE_LAUNCH]`.
 
-
-## Trailmap
-- Add custom buttons for "fetch" tab.
-- Option: Close after update
-- Indicate when updated VV is available
-- Run from MQ
-- Deeper integration with the forums
-
 ![Watchers on RedGuides](https://www.redguides.com/community/resources/redfetch.3177/watchers-sparkline?months=12&w=500&h=180)
 
 ## Contributing

{redfetch-1.3.0 → redfetch-1.4.1}/pyproject.toml

@@ -21,9 +21,10 @@ dependencies = [
     "aiofiles~=25.1",
     "aiosqlite~=0.22",
     "aiohttp~=3.14",
-    "cachetools~=7.1",
     "diskcache~=5.6",
-    "dynaconf~=3.2,<3.3",  # 3.3 has a bug
+    "dynaconf~=3.3,>=3.3.2",  # (pr 1409 fixed RecursionError)
+    "filelock~=3.29",
+    "hishel[httpx,async]~=1.3",
     "httpx[http2]~=0.28",
     "keepachangelog~=2.0",
     "keyring~=25.7",
@@ -32,7 +33,6 @@ dependencies = [
     "pydantic~=2.13",
     "platformdirs~=4.10",
     "psutil~=7.2",
-    "pyperclip~=1.11",
     "rich~=15.0",
     "tenacity~=9.1",
     "textual~=8.2",
@@ -78,3 +78,9 @@ dependencies = [
   "pip-tools",
   "pip-check"
 ]
+
+[tool.hatch.envs.dev.scripts]
+# Regenerate the README 'Command Line Reference' from the typer app.
+gen-docs = "python tests/cli_reference.py --write"
+# Verify it's current
+check-docs = "python tests/cli_reference.py --check"

{redfetch-1.3.0 → redfetch-1.4.1}/src/redfetch/__about__.py

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

redfetch-1.4.1/src/redfetch/api.py

@@ -0,0 +1,50 @@
+"""Resource API client: fetch_*() takes a client, get_*() is self-contained."""
+
+import httpx
+from redfetch import net
+from redfetch.sync_types import SyncInfo
+
+BASE_URL = net.BASE_URL
+
+
+async def fetch_sync_info(client: httpx.AsyncClient) -> SyncInfo:
+    """Per-user sync info"""
+    url = f'{BASE_URL}/api/rgsync'
+    is_level_2 = is_moderator = False
+    watched: set[str] = set()
+    licenses: list[dict] = []
+    page = 1
+    while True:
+        data = await net.get_json(client, url, params={'page': page})
+        is_level_2 = bool(data.get('is_level_2', False))
+        is_moderator = bool(data.get('is_moderator', False))
+        watched.update(str(rid) for rid in data.get('watched', []))
+        licenses.extend(data.get('licenses', []))
+        if not data.get('pagination', {}).get('has_more', False):
+            break
+        page += 1
+
+    licensed_ids = {
+        str(lic['resource_id']) for lic in licenses if lic.get('resource_id') is not None
+    }
+    return SyncInfo(
+        is_level_2=is_level_2,
+        is_moderator=is_moderator,
+        watched=watched,
+        licensed_ids=licensed_ids,
+        licenses=licenses,
+    )
+
+
+async def get_sync_info(headers: dict) -> SyncInfo:
+    """fetch_sync_info for callers that hold headers but not a client."""
+    async with httpx.AsyncClient(headers=headers, http2=True, timeout=30.0) as client:
+        return await fetch_sync_info(client)
+
+
+async def get_resource_details(resource_id: int, headers: dict) -> dict:
+    """Retrieve details of a specific resource from the API."""
+    url = f'{BASE_URL}/api/resources/{resource_id}'
+    async with httpx.AsyncClient(headers=headers, http2=True, timeout=30.0) as client:
+        data = await net.get_json(client, url)
+    return data['resource']

{redfetch-1.3.0 → redfetch-1.4.1}/src/redfetch/config.py

@@ -8,6 +8,7 @@ import shutil
 # third-party
 import tomlkit
 from dynaconf import Dynaconf, Validator, ValidationError
+from dynaconf.loaders import env_loader
 from platformdirs import user_config_dir, user_data_dir
 
 # Parent Category to folder
@@ -162,12 +163,40 @@ def initialize_config():
         ]
     )
 
+    self_heal_eqpath()
     write_breadcrumb()
 
     # Return the settings object for potential use
     return settings
 
 
+def self_heal_eqpath() -> None:
+    """Fill a blank or broken EQ PATH from autologin's login.db, per env."""
+    from redfetch import utils, detecteq
+
+    for env in ("LIVE", "TEST", "EMU"):
+        try:
+            env_settings = settings.from_env(env)
+            stored = env_settings.get("EQPATH")
+            if stored and detecteq._is_valid_eq_dir(stored):
+                continue  # heal only when blank or broken
+
+            vvmq_id = utils.get_current_vvmq_id(env)
+            if not vvmq_id:
+                continue
+            vvmq = utils.resolve_special_destination(
+                env_settings.SPECIAL_RESOURCES.get(vvmq_id), env_settings.DOWNLOAD_FOLDER
+            )
+            if not vvmq:
+                continue
+
+            detected = detecteq.read_autologin_eq_path(os.path.join(vvmq, "config"), env)
+            if detected and detected != stored: 
+                update_setting(["EQPATH"], detected, env=env)
+        except Exception:
+            continue  # we're not stopping for this
+
+
 def _resolve_redfetch_executable():
     """PYAPP will give a path when built with PYAPP_PASS_LOCATION=1"""
     pyapp = os.environ.get("PYAPP")
@@ -459,25 +488,8 @@ def update_setting(setting_path, setting_value, env=None):
 
 
 def write_env_to_file(new_env):
-    """Update the environment setting in the .env file."""
+    """Persist the selected environment to the .env file; dynaconf reads it back via env_switcher."""
     if env_file_path is None:
         raise RuntimeError("Configuration has not been initialized. Call initialize_config() first.")
 
-    # Read the existing content of the .env file
-    with open(env_file_path, 'r') as file:
-        lines = file.readlines()
-
-    # Update the environment line
-    updated = False
-    for i, line in enumerate(lines):
-        if line.startswith('REDFETCH_ENV='):
-            lines[i] = f'REDFETCH_ENV={new_env}\n'
-            updated = True
-            break
-
-    # If the environment line was not found, add it
-    if not updated:
-        lines.append(f'REDFETCH_ENV={new_env}\n')
-
-    # Write the updated content back to the .env file
-    atomic_write_text(env_file_path, ''.join(lines))
+    env_loader.write(env_file_path, {"REDFETCH_ENV": new_env})

{redfetch-1.3.0 → redfetch-1.4.1}/src/redfetch/detecteq.py

@@ -1,5 +1,7 @@
 import os
+import sqlite3
 import sys
+from pathlib import Path
 
 # Only import winreg on Windows
 if sys.platform == 'win32':
@@ -112,5 +114,29 @@ def find_everquest_uninstall_location():
     return None
 
 
+def read_autologin_eq_path(mq_config_dir: str | None, server_type: str) -> str | None:
+    """from autologin's login.db."""
+    if not mq_config_dir:
+        return None
+    db_path = os.path.join(mq_config_dir, "login.db")
+    if not os.path.isfile(db_path):
+        return None  # autologin maybe hasn't run
+
+    con = None
+    try:
+        con = sqlite3.connect(Path(db_path).as_uri() + "?mode=ro", uri=True)
+        row = con.execute(
+            "SELECT eq_path FROM server_types WHERE type = LOWER(?)", (server_type,)
+        ).fetchone()
+    except (sqlite3.Error, ValueError):
+        return None  # locked or something
+    finally:
+        if con is not None:
+            con.close()
+
+    candidate = row[0] if row else None
+    return os.path.normpath(candidate) if _is_valid_eq_dir(candidate) else None
+
+
 if __name__ == "__main__":
     print(find_everquest_uninstall_location() or "")