redfetch 1.1.2__tar.gz → 1.3.0__tar.gz

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

@@ -27,13 +27,13 @@ jobs:
       package-version: ${{ steps.get_version.outputs.version }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Ensure full Git history is available for versioning
           fetch-tags: true
 
       - name: Set Up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
@@ -85,7 +85,7 @@ jobs:
       project-version: ${{ steps.set_version.outputs.version }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Ensure full Git history is available for versioning
 
@@ -110,7 +110,7 @@ jobs:
           Get-Content $env:GITHUB_ENV
 
       - name: Set Up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
@@ -184,17 +184,60 @@ 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
-        uses: dlemstra/code-sign-action@v1
-        with:
-          certificate: '${{ secrets.CERTIFICATE_PFX }}'
-          password: '${{ secrets.CERTIFICATE_PFX_PASSWORD }}'
-          files: |
-            redfetch.exe
-          description: 'redfetch 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: |
+          $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\\" } |
+            Sort-Object LastWriteTime -Descending |
+            Select-Object -First 1 -ExpandProperty FullName
+
+          if (-not $signtool) { throw "signtool.exe not found" }
+          Write-Host "Using signtool: $signtool"
+
+          $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 -Force $CertFile, $KeyFile
 
       - name: Upload Executable Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: redfetch.exe
           path: redfetch.exe
@@ -205,9 +248,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Download Executable Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: redfetch.exe
       - name: Redguides Publish

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

@@ -5,6 +5,32 @@ 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
+- Custom category directories: override where `lua`, `macros`, or `plugins` install via `CATEGORY_PATHS` in `settings.local.toml`.
+- Clearer messages for users on why certain resources are skipped or blocked.
+
+### Changed
+- Rewrote the sync pipeline with separate discovery, planning, and execution stages.
+
 ## [1.1.2] - 2026-02-16
 
 ### Fixed

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: redfetch
-Version: 1.1.2
+Version: 1.3.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/ab2c7322507ec27526aed8b90ef1ca15a8bcab8f.zip
+Project-URL: Source_archive, https://github.com/RedGuides/redfetch/archive/aaf2d42ab82d45abeadfafa943e2b61abba2cb60.zip
 Author-email: Redbot <ask@redguides.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE
@@ -17,27 +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: cachetools~=7.1
 Requires-Dist: diskcache~=5.6
-Requires-Dist: dynaconf~=3.2
+Requires-Dist: dynaconf<3.3,~=3.2
 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.13
 Requires-Dist: pyperclip~=1.11
 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~=0.6
-Requires-Dist: textual~=7.5
-Requires-Dist: tomlkit~=0.14
-Requires-Dist: typer~=0.21
+Requires-Dist: textual-fspicker~=1.0
+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)
@@ -108,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
 > 
@@ -172,6 +176,18 @@ If there are local files you don't want overwritten by a resource, you can add t
 navmesh = ["befallen.navmesh", "innothuleb.navmesh"]
 ```
 
+### Custom category directories
+
+If you share `lua`, `macros`, or `plugins` directories across multiple MQ environments, you can override where an entire category is installed. Add a `CATEGORY_PATHS` section to your `settings.local.toml`:
+
+```toml
+[DEFAULT.CATEGORY_PATHS]
+lua = 'D:\\shared\\lua'
+macros = 'D:\\shared\\macros'
+```
+
+Absolute paths are used as-is. Relative paths are joined to `DOWNLOAD_FOLDER`. You can set this globally in `[DEFAULT]` or per-environment (`[LIVE.CATEGORY_PATHS]`, `[TEST.CATEGORY_PATHS]`, etc.).
+
 ## Tinkerers
 
 If you self-compile MacroQuest or use a discord friend's copy, you can still keep your scripts and plugins in sync with redfetch by opting out of Very Vanilla:
@@ -184,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.1.2 → redfetch-1.3.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
 > 
@@ -130,6 +132,18 @@ If there are local files you don't want overwritten by a resource, you can add t
 navmesh = ["befallen.navmesh", "innothuleb.navmesh"]
 ```
 
+### Custom category directories
+
+If you share `lua`, `macros`, or `plugins` directories across multiple MQ environments, you can override where an entire category is installed. Add a `CATEGORY_PATHS` section to your `settings.local.toml`:
+
+```toml
+[DEFAULT.CATEGORY_PATHS]
+lua = 'D:\\shared\\lua'
+macros = 'D:\\shared\\macros'
+```
+
+Absolute paths are used as-is. Relative paths are joined to `DOWNLOAD_FOLDER`. You can set this globally in `[DEFAULT]` or per-environment (`[LIVE.CATEGORY_PATHS]`, `[TEST.CATEGORY_PATHS]`, etc.).
+
 ## Tinkerers
 
 If you self-compile MacroQuest or use a discord friend's copy, you can still keep your scripts and plugins in sync with redfetch by opting out of Very Vanilla:
@@ -142,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.1.2 → redfetch-1.3.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,24 +20,25 @@ classifiers = [
 dependencies = [
     "aiofiles~=25.1",
     "aiosqlite~=0.22",
-    "aiohttp~=3.13",
-    "cachetools~=7.0",
+    "aiohttp~=3.14",
+    "cachetools~=7.1",
     "diskcache~=5.6",
-    "dynaconf~=3.2",
+    "dynaconf~=3.2,<3.3",  # 3.3 has a bug
     "httpx[http2]~=0.28",
     "keepachangelog~=2.0",
-    "keyring~=25.6",
+    "keyring~=25.7",
     "md2bbcode",
-    "packaging~=26.0",
-    "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~=7.5",
-    "textual-fspicker~=0.6",
-    "tomlkit~=0.14",
-    "typer~=0.21",
+    "textual~=8.2",
+    "textual-fspicker~=1.0",
+    "tomlkit~=0.15",
+    "typer~=0.26",
     "pywin32; sys_platform == 'win32'"
 ]
 

redfetch-1.3.0/src/redfetch/__about__.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+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)
+
+__commit_id__ = commit_id = None

redfetch-1.3.0/src/redfetch/api.py

@@ -0,0 +1,134 @@
+"""Resource API client: fetch_*() takes a client, get_*() is self-contained."""
+
+import asyncio
+
+import httpx
+from redfetch import auth
+from redfetch import net
+from redfetch.sync_types import RemoteStatus, SyncModel
+
+BASE_URL = net.BASE_URL
+
+
+class ResourceRecord(SyncModel):
+    """Result of a single-resource API check: status plus optional payload or error."""
+    resource_id: str
+    status: RemoteStatus
+    resource: dict | None = None
+    error: str | None = None
+
+
+async def fetch_watched_page(client: httpx.AsyncClient, page: int) -> tuple[list, int]:
+    """Fetch a single page of watched resources."""
+    url = f'{BASE_URL}/api/rgwatched'
+    try:
+        data = await net.get_json(client, url, params={'page': page})
+        last_page = data['pagination']['last_page']
+        items = data.get('resources', [])
+        return items, last_page
+    except Exception as e:
+        print(f"Error fetching watched resources page {page}: {e}")
+        return [], 0
+
+
+async def fetch_licenses_page(client: httpx.AsyncClient, page: int) -> tuple[list, int]:
+    """Fetch a single page of user licenses."""
+    url = f'{BASE_URL}/api/user-licenses'
+    try:
+        data = await net.get_json(client, url, params={'page': page})
+        last_page = data['pagination']['last_page']
+        items = data.get('licenses', [])
+        return items, last_page
+    except Exception as e:
+        print(f"Error fetching licenses page {page}: {e}")
+        return [], 0
+
+
+async def fetch_resource_record(client: httpx.AsyncClient, resource_id: str) -> ResourceRecord:
+    """Fetch a single resource and classify its availability."""
+    url = f'{BASE_URL}/api/resources/{resource_id}'
+    try:
+        data = await net.get_json(client, url)
+        resource = data['resource']
+        current_files = resource.get('current_files') or []
+        if not resource.get('can_download', False):
+            status: RemoteStatus = 'access_denied'
+        elif len(current_files) == 0:
+            status = 'no_files'
+        elif len(current_files) > 1:
+            status = 'multiple_files'
+        else:
+            status = 'downloadable'
+        return ResourceRecord(resource_id=resource_id, status=status, resource=resource)
+    except httpx.HTTPStatusError as e:
+        status = 'not_found' if e.response.status_code == 404 else 'fetch_error'
+        return ResourceRecord(resource_id=resource_id, status=status, error=str(e))
+    except Exception as e:
+        return ResourceRecord(resource_id=resource_id, status='fetch_error', error=str(e))
+
+
+async def fetch_resource_records_batch(client: httpx.AsyncClient, resource_ids: list[str]) -> list[ResourceRecord]:
+    """Fetch multiple resource records concurrently."""
+    if not resource_ids:
+        return []
+    return list(await asyncio.gather(
+        *(fetch_resource_record(client, rid) for rid in resource_ids)
+    ))
+
+
+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:
+        response = await client.get(url)
+    response.raise_for_status()
+    return response.json()['resource']
+
+
+async def fetch_watched_resources(client: httpx.AsyncClient) -> list:
+    """Fetch all watched resources with concurrent pagination."""
+    items, total_pages = await fetch_watched_page(client, 1)
+    if total_pages <= 1:
+        return items
+
+    coros = [fetch_watched_page(client, p) for p in range(2, total_pages + 1)]
+    page_results = await asyncio.gather(*coros)
+
+    for page_items, _ in page_results:
+        items.extend(page_items)
+    
+    return items
+
+
+async def fetch_licenses(client: httpx.AsyncClient) -> list:
+    """Fetch all user licenses with concurrent pagination."""
+    items, total_pages = await fetch_licenses_page(client, 1)
+    if total_pages <= 1:
+        return items
+    coros = [fetch_licenses_page(client, p) for p in range(2, total_pages + 1)]
+    page_results = await asyncio.gather(*coros)
+
+    for page_items, _ in page_results:
+        items.extend(page_items)
+    
+    return items
+
+
+_KISS_CACHE_TTL_SECONDS = 60
+
+
+async def is_kiss_downloadable(headers, force_refresh: bool = False):
+    """Check for level 2 access by checking KISS."""
+    cache = auth.get_disk_cache()
+    cache_key = "kiss"
+
+    if not force_refresh:
+        cached = cache.get(cache_key)
+        if cached is not None:
+            return bool(cached)
+
+    async with httpx.AsyncClient(headers=headers, http2=True) as client:
+        record = await fetch_resource_record(client, "4")
+    result = record.status == "downloadable"
+    cache.set(cache_key, bool(result), expire=_KISS_CACHE_TTL_SECONDS)
+    return result