redfetch 1.2.0__tar.gz → 1.4.0__tar.gz

{redfetch-1.2.0 → redfetch-1.4.0}/.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
@@ -184,11 +200,36 @@ jobs:
             --set-version-string "InternalName" "redfetch" `
             --set-icon "redfetch.ico"
 
+      - name: Install Google Cloud KMS CNG Provider
+        shell: pwsh
+        run: |
+          if (Test-Path "$env:SystemRoot\System32\kmscng.dll") {
+            Write-Host "kmscng already installed."
+            return
+          }
+          $url = "https://github.com/GoogleCloudPlatform/kms-integrations/releases/download/cng-v1.3/kmscng-1.3-windows-amd64.zip"
+          $zip = Join-Path $env:RUNNER_TEMP "kmscng.zip"
+          $dest = Join-Path $env:RUNNER_TEMP "kmscng"
+          Invoke-WebRequest $url -OutFile $zip
+          Expand-Archive -Path $zip -DestinationPath $dest -Force
+          $msi = Get-ChildItem -Path $dest -Recurse -Filter *.msi | Select-Object -First 1
+          if (-not $msi) { throw "kmscng MSI not found in archive" }
+          Start-Process msiexec.exe -ArgumentList "/i `"$($msi.FullName)`" /qn /norestart" -Wait -NoNewWindow
+          if (-not (Test-Path "$env:SystemRoot\System32\kmscng.dll")) { throw "kmscng installation failed" }
+          Write-Host "kmscng installed."
+
       - name: Sign Executable
         shell: pwsh
+        env:
+          KMS_KEY: projects/code-signing-rg/locations/global/keyRings/redkeys/cryptoKeys/rgkey/cryptoKeyVersions/1
+          SIGNING_CERT: ${{ secrets.SIGNING_CERT }}
+          GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
         run: |
-          $certPath = Join-Path $env:RUNNER_TEMP "cert.pfx"
-          [IO.File]::WriteAllBytes($certPath, [Convert]::FromBase64String("${{ secrets.CERTIFICATE_PFX }}"))
+          $CertFile = Join-Path $env:RUNNER_TEMP "user.crt"
+          $KeyFile  = Join-Path $env:RUNNER_TEMP "gcp-sa.json"
+          [IO.File]::WriteAllBytes($CertFile, [Convert]::FromBase64String($env:SIGNING_CERT))
+          [IO.File]::WriteAllText($KeyFile, $env:GCP_SA_KEY)
+          $env:GOOGLE_APPLICATION_CREDENTIALS = $KeyFile
 
           $signtool = Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits" -Recurse -Filter "signtool.exe" |
             Where-Object { $_.FullName -match "\\x64\\" } |
@@ -198,10 +239,18 @@ jobs:
           if (-not $signtool) { throw "signtool.exe not found" }
           Write-Host "Using signtool: $signtool"
 
-          & $signtool sign /f $certPath /p "${{ secrets.CERTIFICATE_PFX_PASSWORD }}" /fd sha256 /tr "http://timestamp.digicert.com" /td sha256 /v redfetch.exe
+          $tsaServers = @('http://timestamp.digicert.com', 'http://timestamp.sectigo.com')
+          $maxAttempts = 5
+          for ($attempt = 1; $attempt -le $maxAttempts; $attempt++) {
+            $tsa = $tsaServers[($attempt - 1) % $tsaServers.Count]
+            & $signtool sign /fd SHA256 /f $CertFile /csp "Google Cloud KMS Provider" /kc $env:KMS_KEY /tr $tsa /td sha256 /v redfetch.exe
+            if ($LASTEXITCODE -eq 0) { break }
+            if ($attempt -eq $maxAttempts) { throw "Signing failed after $maxAttempts attempts" }
+            Start-Sleep -Seconds 2
+          }
           & $signtool verify /pa /v redfetch.exe
 
-          Remove-Item $certPath
+          Remove-Item -Force $CertFile, $KeyFile
 
       - name: Upload Executable Artifact
         uses: actions/upload-artifact@v7

{redfetch-1.2.0 → redfetch-1.4.0}/.gitignore

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

redfetch-1.4.0/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.2.0 → redfetch-1.4.0}/CHANGELOG.md

@@ -5,6 +5,23 @@ 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.3.0] - 2026-06-26
+
+### Added
+- `--server` on `update` and `download`: use a different server for one run.
+- TUI: "Also start post-update" — launch EQBCS, MySEQ, or a custom program after a successful update. ([#18](https://github.com/RedGuides/redfetch/issues/18))
+- Staff picks: Ninjadvloot.inc is now on LIVE/TEST/EMU.
+
+### Changed
+- Config paths that contain `eqgame.exe` are allowed with a warning instead of being blocked outright. ([#22](https://github.com/RedGuides/redfetch/issues/22))
+- TUI: "Close MQ pre-update" and "Start MQ post-update" are now No / Ask / Yes toggles, so you can pick the prompt-each-time ("Ask") behavior from the UI instead of only on/off.
+- Only settings you've actually changed are written to `settings.local.toml`, keeping the file tidy.
+
+### Fixed
+- Licensed resources will now download even if you have duplicates. ([#24](https://github.com/RedGuides/redfetch/issues/24))
+- Update checks notice when a resource's subfolder changes.
+- Fixed "RecursionError" on startup by rolling back a dependency.
+
 ## [1.2.0] - 2026-04-05
 
 ### Added

{redfetch-1.2.0 → redfetch-1.4.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: redfetch
-Version: 1.2.0
+Version: 1.4.0
 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/35e27c4778b6d07b5be189be22877ad5bb541d27.zip
+Project-URL: Source_archive, https://github.com/RedGuides/redfetch/archive/ccf5cf558b6e6f261fab4079e837d5cb47e7975d.zip
 Author-email: Redbot <ask@redguides.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE
@@ -17,28 +17,29 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Utilities
+Requires-Python: >=3.12
 Requires-Dist: aiofiles~=25.1
-Requires-Dist: aiohttp~=3.13
+Requires-Dist: aiohttp~=3.14
 Requires-Dist: aiosqlite~=0.22
-Requires-Dist: cachetools~=7.0
 Requires-Dist: diskcache~=5.6
-Requires-Dist: dynaconf~=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.6
+Requires-Dist: keyring~=25.7
 Requires-Dist: md2bbcode
-Requires-Dist: packaging~=26.0
-Requires-Dist: platformdirs~=4.5
+Requires-Dist: packaging~=26.2
+Requires-Dist: platformdirs~=4.10
 Requires-Dist: psutil~=7.2
-Requires-Dist: pydantic~=2.12
-Requires-Dist: pyperclip~=1.11
+Requires-Dist: pydantic~=2.13
 Requires-Dist: pywin32; sys_platform == 'win32'
-Requires-Dist: rich~=14.3
+Requires-Dist: rich~=15.0
 Requires-Dist: tenacity~=9.1
 Requires-Dist: textual-fspicker~=1.0
-Requires-Dist: textual~=8.1
-Requires-Dist: tomlkit~=0.14
-Requires-Dist: typer~=0.21
+Requires-Dist: textual~=8.2
+Requires-Dist: tomlkit~=0.15
+Requires-Dist: typer~=0.26
 Description-Content-Type: text/markdown
 
 ![six wizards levitating a package, the word redfetch underneath](https://www.redguides.com/images/redfetchlogo.png)
@@ -109,8 +110,10 @@ To run redfetch from the command line:
 > ### 📦 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
 > 
@@ -197,12 +200,31 @@ redfetch.exe config SPECIAL_RESOURCES.2218.opt_in false --server TEST
 
 Then assign the *Very Vanilla MQ* path to your self-compiled MacroQuest.
 
+### Custom post-update launch
+
+redfetch can launch extra programs after an update completes. Aside from the normal UI toggles, you can add `custom` to `POST_UPDATE_LAUNCH.targets` in `settings.local.toml`, then set `command` to whatever redfetch should run:
+
+```toml
+[LIVE.POST_UPDATE_LAUNCH]
+targets = ["custom"]
+command = ['C:\Tools\AfterRedfetch\after-update.exe', '--server', 'LIVE']
+```
+
+You can also combine it with the built-in post-update launches. For example, to start EQBCS and MySEQ and run your own Python script:
+
+```toml
+[LIVE.POST_UPDATE_LAUNCH]
+targets = ["myseq", "custom", "eqbcs"]
+command = ["C:\\Users\\Public\\Python\\python.exe", "C:\\Users\\Public\\redfetch\\after_update.py"]
+```
+
+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
-- Launch programs with cli options
 - Indicate when updated VV is available
-- Launch more than just mq (eqbcs, etc) upon update. 
 - Run from MQ
 - Deeper integration with the forums
 

{redfetch-1.2.0 → redfetch-1.4.0}/README.md

@@ -66,8 +66,10 @@ To run redfetch from the command line:
 > ### 📦 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
 > 
@@ -154,12 +156,31 @@ redfetch.exe config SPECIAL_RESOURCES.2218.opt_in false --server TEST
 
 Then assign the *Very Vanilla MQ* path to your self-compiled MacroQuest.
 
+### Custom post-update launch
+
+redfetch can launch extra programs after an update completes. Aside from the normal UI toggles, you can add `custom` to `POST_UPDATE_LAUNCH.targets` in `settings.local.toml`, then set `command` to whatever redfetch should run:
+
+```toml
+[LIVE.POST_UPDATE_LAUNCH]
+targets = ["custom"]
+command = ['C:\Tools\AfterRedfetch\after-update.exe', '--server', 'LIVE']
+```
+
+You can also combine it with the built-in post-update launches. For example, to start EQBCS and MySEQ and run your own Python script:
+
+```toml
+[LIVE.POST_UPDATE_LAUNCH]
+targets = ["myseq", "custom", "eqbcs"]
+command = ["C:\\Users\\Public\\Python\\python.exe", "C:\\Users\\Public\\redfetch\\after_update.py"]
+```
+
+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
-- Launch programs with cli options
 - Indicate when updated VV is available
-- Launch more than just mq (eqbcs, etc) upon update. 
 - Run from MQ
 - Deeper integration with the forums
 

{redfetch-1.2.0 → redfetch-1.4.0}/pyproject.toml

@@ -3,6 +3,7 @@ name = "redfetch"
 description = "Download and publish EverQuest scripts and software using the RedGuides API"
 readme = "README.md"
 license = "GPL-3.0-or-later"
+requires-python = ">=3.12"
 dynamic = ["version", "urls"]
 authors = [
     { name = "Redbot", email = "ask@redguides.com" }
@@ -19,25 +20,25 @@ classifiers = [
 dependencies = [
     "aiofiles~=25.1",
     "aiosqlite~=0.22",
-    "aiohttp~=3.13",
-    "cachetools~=7.0",
+    "aiohttp~=3.14",
     "diskcache~=5.6",
-    "dynaconf~=3.2",
+    "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.6",
+    "keyring~=25.7",
     "md2bbcode",
-    "packaging~=26.0",
-    "pydantic~=2.12",
-    "platformdirs~=4.5",
+    "packaging~=26.2",
+    "pydantic~=2.13",
+    "platformdirs~=4.10",
     "psutil~=7.2",
-    "pyperclip~=1.11",
-    "rich~=14.3",
+    "rich~=15.0",
     "tenacity~=9.1",
-    "textual~=8.1",
+    "textual~=8.2",
     "textual-fspicker~=1.0",
-    "tomlkit~=0.14",
-    "typer~=0.21",
+    "tomlkit~=0.15",
+    "typer~=0.26",
     "pywin32; sys_platform == 'win32'"
 ]
 

{redfetch-1.2.0 → redfetch-1.4.0}/src/redfetch/__about__.py

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

redfetch-1.4.0/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.2.0 → redfetch-1.4.0}/src/redfetch/auth.py

@@ -553,7 +553,7 @@ def initialize_keyring():
         raise RuntimeError(
             "No suitable keyring backend found, probably because you're not on Windows.\n\n"
             "Please install `keyrings.alt` by running:\n"
-            "    pip install keyrings.alt\n\n"
+            "    pipx inject redfetch keyrings.alt\n\n"
             "Then restart the application."
         )
     except Exception as e: