upload-assistant 4.1__tar.gz → 4.2__tar.gz

{upload_assistant-4.1/upload_assistant.egg-info → upload_assistant-4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upload-assistant
-Version: 4.1
+Version: 4.2
 Summary: A simple tool to take the work out of uploading.
 Author: wastaken7
 Maintainer: wastaken7
@@ -149,6 +149,10 @@ This branch introduces new media categories and automation features not present
   - **Discogs & MusicBrainz APIs**: Optionally queries external APIs (Discogs via release/master ID or URL, and MusicBrainz) for metadata enrichment.
   - **Artwork & Cover Extraction**: Automatically searches for local cover images or extracts embedded artwork from FLAC/MP3/M4A tags to upload to image hosts.
   - **Preflight & Rule Validation**: Enforces mechanical validation for audio formats, sample/bit rates, track counts, and hybrid setups before uploading.
+- **Adult Video (`XXX` Category)**:
+  - **Automatic Detection & Metadata**: Recognizes supported adult-platform release names, extracts common title, studio, and date fields, and builds descriptive keywords.
+  - **Contact Sheets & Artwork**: Generates one configurable contact sheet per video and creates a fallback cover from the source when artwork is not supplied.
+  - **Workflow Guide**: See the dedicated [XXX category upload guide](docs/xxx-upload.md) for naming, overrides, WebUI usage, and supported destinations.
 
 ### 2. Audio Stream Spectrogram Generation
 
@@ -293,6 +297,7 @@ Sequence Usenet and torrent tracker uploads while limiting contention with qBitt
 | <img src="web_ui/static/img/trackers/curupira.png" width="16" height="16" />    | Curupira    | CURUPIRA    | MOVIE, TV, BOOK, GAME        |
 | <img src="web_ui/static/img/trackers/drunkenslug.png" width="16" height="16" /> | DrunkenSlug | DRUNKENSLUG | MOVIE, TV, BOOK, GAME        |
 | <img src="web_ui/static/img/trackers/nzbgeek.png" width="16" height="16" />     | NZBGeek     | NZBGEEK     | MOVIE, TV, BOOK, GAME, MUSIC |
+| <img src="web_ui/static/img/trackers/nzbnest.png" width="16" height="16" />     | NzbNest     | NZBNEST     | MOVIE, TV, BOOK, GAME, MUSIC |
 
 </details>
 

{upload_assistant-4.1 → upload_assistant-4.2}/README.md

@@ -66,6 +66,10 @@ This branch introduces new media categories and automation features not present
   - **Discogs & MusicBrainz APIs**: Optionally queries external APIs (Discogs via release/master ID or URL, and MusicBrainz) for metadata enrichment.
   - **Artwork & Cover Extraction**: Automatically searches for local cover images or extracts embedded artwork from FLAC/MP3/M4A tags to upload to image hosts.
   - **Preflight & Rule Validation**: Enforces mechanical validation for audio formats, sample/bit rates, track counts, and hybrid setups before uploading.
+- **Adult Video (`XXX` Category)**:
+  - **Automatic Detection & Metadata**: Recognizes supported adult-platform release names, extracts common title, studio, and date fields, and builds descriptive keywords.
+  - **Contact Sheets & Artwork**: Generates one configurable contact sheet per video and creates a fallback cover from the source when artwork is not supplied.
+  - **Workflow Guide**: See the dedicated [XXX category upload guide](docs/xxx-upload.md) for naming, overrides, WebUI usage, and supported destinations.
 
 ### 2. Audio Stream Spectrogram Generation
 
@@ -210,6 +214,7 @@ Sequence Usenet and torrent tracker uploads while limiting contention with qBitt
 | <img src="web_ui/static/img/trackers/curupira.png" width="16" height="16" />    | Curupira    | CURUPIRA    | MOVIE, TV, BOOK, GAME        |
 | <img src="web_ui/static/img/trackers/drunkenslug.png" width="16" height="16" /> | DrunkenSlug | DRUNKENSLUG | MOVIE, TV, BOOK, GAME        |
 | <img src="web_ui/static/img/trackers/nzbgeek.png" width="16" height="16" />     | NZBGeek     | NZBGEEK     | MOVIE, TV, BOOK, GAME, MUSIC |
+| <img src="web_ui/static/img/trackers/nzbnest.png" width="16" height="16" />     | NzbNest     | NZBNEST     | MOVIE, TV, BOOK, GAME, MUSIC |
 
 </details>
 

upload_assistant-4.2/bin/binary_dependencies.py

@@ -0,0 +1,7 @@
+"""Pinned versions and upstream repositories for managed binary dependencies."""
+
+from bin.binary_dependency_pins import PINS
+
+DEPENDENCY_VERSIONS = {dependency: pin.version for dependency, pin in PINS.items()}
+DEPENDENCY_REPOSITORIES = {dependency: pin.repository for dependency, pin in PINS.items()}
+DEPENDENCY_CHECKSUMS = {dependency: pin.checksums for dependency, pin in PINS.items()}

upload_assistant-4.2/bin/binary_dependency_pins/__init__.py

@@ -0,0 +1,33 @@
+"""Independently updatable version and integrity pins for managed binaries."""
+
+from dataclasses import dataclass
+from pathlib import Path
+
+from bin.binary_dependency_pins import bdinfo, dovi_tool, ffmpeg, hdr10plus_tool, mkbrr, nyuu, par2, pesto, seven_zip
+
+
+@dataclass(frozen=True)
+class BinaryDependencyPin:
+    version: str
+    repository: str
+    checksums: dict[str, str]
+    path: Path
+
+
+def _pin(module_path: str | None, version: str, repository: str, checksums: dict[str, str]) -> BinaryDependencyPin:
+    if module_path is None:
+        raise RuntimeError(f"Cannot update binary dependency pins without a source file for {repository}")
+    return BinaryDependencyPin(version, repository, checksums, Path(module_path))
+
+
+PINS = {
+    "7zip": _pin(seven_zip.__file__, seven_zip.VERSION, seven_zip.REPOSITORY, seven_zip.SHA256_BY_ASSET),
+    "bdinfo": _pin(bdinfo.__file__, bdinfo.VERSION, bdinfo.REPOSITORY, bdinfo.SHA256_BY_ASSET),
+    "dovi_tool": _pin(dovi_tool.__file__, dovi_tool.VERSION, dovi_tool.REPOSITORY, dovi_tool.SHA256_BY_ASSET),
+    "ffmpeg": _pin(ffmpeg.__file__, ffmpeg.VERSION, ffmpeg.REPOSITORY, ffmpeg.SHA256_BY_ASSET),
+    "hdr10plus_tool": _pin(hdr10plus_tool.__file__, hdr10plus_tool.VERSION, hdr10plus_tool.REPOSITORY, hdr10plus_tool.SHA256_BY_ASSET),
+    "mkbrr": _pin(mkbrr.__file__, mkbrr.VERSION, mkbrr.REPOSITORY, mkbrr.SHA256_BY_ASSET),
+    "nyuu": _pin(nyuu.__file__, nyuu.VERSION, nyuu.REPOSITORY, nyuu.SHA256_BY_ASSET),
+    "par2": _pin(par2.__file__, par2.VERSION, par2.REPOSITORY, par2.SHA256_BY_ASSET),
+    "pesto": _pin(pesto.__file__, pesto.VERSION, pesto.REPOSITORY, pesto.SHA256_BY_ASSET),
+}

upload_assistant-4.2/bin/binary_dependency_pins/bdinfo.py

@@ -0,0 +1,12 @@
+"""Release and integrity pins for BDInfo."""
+
+VERSION = "v0.4.2"
+REPOSITORY = "autobrr/go-bdinfo"
+SHA256_BY_ASSET = {
+    "bdinfo_0.4.2_darwin_amd64.tar.gz": "f4679bd06077f1f9080b58559b235f1f4d8fb8ddbb49b872956904d28b33e65c",
+    "bdinfo_0.4.2_darwin_arm64.tar.gz": "98dffc9dbd6f81f6b691271ecf5462b8164ec07a4f7ea357b9f03eefba06969a",
+    "bdinfo_0.4.2_linux_amd64.tar.gz": "8794988af6e154bc34ceccd8c327e4eb2b6386e10f248a20e21e190d472fe9b1",
+    "bdinfo_0.4.2_linux_arm.tar.gz": "c6a49181961836fde75e15f9dfd19284a12bc3037f164de72bd9470211461053",
+    "bdinfo_0.4.2_linux_arm64.tar.gz": "f9f791534b48ad6c507bef3284be8a8395edc2f7193ac18f7bcde2a5e22467dd",
+    "bdinfo_0.4.2_windows_amd64.zip": "e68d48912b1ca7dba73c872a67c36abaabb7c46b73ac5dad32998025246bc462",
+}

upload_assistant-4.2/bin/binary_dependency_pins/dovi_tool.py

@@ -0,0 +1,11 @@
+"""Release and integrity pins for dovi_tool."""
+
+VERSION = "2.3.4"
+REPOSITORY = "quietvoid/dovi_tool"
+SHA256_BY_ASSET = {
+    "dovi_tool-2.3.4-aarch64-pc-windows-msvc.zip": "4056206e28f7d733fd8a29add91d286d22956b41138d6ae0d51dbbf2289d9483",
+    "dovi_tool-2.3.4-aarch64-unknown-linux-musl.tar.gz": "b4f22a7db56954efe4ed8d02276d0f991799e84602f3584711be6c9df950cb15",
+    "dovi_tool-2.3.4-universal-macOS.zip": "30d4f512eb67b7f1632cd28be5c62989bedad23f4710578aafc20c384b48ece6",
+    "dovi_tool-2.3.4-x86_64-pc-windows-msvc.zip": "0d9733d311dfe49f9dca0c350f7e6d978182673d333c6f07f7365daf9e6c81eb",
+    "dovi_tool-2.3.4-x86_64-unknown-linux-musl.tar.gz": "1844258e13c26607b32224bf1fa82b595d3b35949f5467405fda560daad32b3f",
+}

upload_assistant-4.2/bin/binary_dependency_pins/ffmpeg.py

@@ -0,0 +1,7 @@
+"""Release and integrity pins for FFmpeg."""
+
+VERSION = "9.0.1"
+REPOSITORY = "GyanD/codexffmpeg"
+SHA256_BY_ASSET = {
+    "ffmpeg-9.0.1-essentials_build.zip": "fec81ae03971d9dd4be3ebe02e263bd2ec1d789483f931bdba5f5715e65da2e9",
+}

upload_assistant-4.2/bin/binary_dependency_pins/hdr10plus_tool.py

@@ -0,0 +1,11 @@
+"""Release and integrity pins for hdr10plus_tool."""
+
+VERSION = "1.7.2"
+REPOSITORY = "quietvoid/hdr10plus_tool"
+SHA256_BY_ASSET = {
+    "hdr10plus_tool-1.7.2-aarch64-pc-windows-msvc.zip": "0cc1cd6ae9fb1115e5dc3d1f6daed47c486410ad5731f60a298e5d78fe995d6b",
+    "hdr10plus_tool-1.7.2-aarch64-unknown-linux-musl.tar.gz": "5fb90607cd94296640f1fc2355207b8107b67baac96d37481423d08a9fce437d",
+    "hdr10plus_tool-1.7.2-universal-macOS.zip": "d76977ed2ea90f8d6bce9035e37ea9dbffcead4725ceb1acf455c25d8658ff28",
+    "hdr10plus_tool-1.7.2-x86_64-pc-windows-msvc.zip": "82b2d560073941b14c6511a431f429e33e134e5caefb60d7e8f6f6e6da8e16ba",
+    "hdr10plus_tool-1.7.2-x86_64-unknown-linux-musl.tar.gz": "06385f37a639d61ba21d4be3150c863846933bc3b58110e094d8fc8f1c2249f2",
+}

upload_assistant-4.2/bin/binary_dependency_pins/mkbrr.py

@@ -0,0 +1,13 @@
+"""Release and integrity pins for mkbrr."""
+
+VERSION = "v1.25.1"
+REPOSITORY = "autobrr/mkbrr"
+SHA256_BY_ASSET = {
+    "mkbrr_1.25.1_darwin_arm64.tar.gz": "42f1c32bd86c3d7b1e1c900ab6d29a43eec74fe3b7f3374fb8da5da19f09f013",
+    "mkbrr_1.25.1_darwin_x86_64.tar.gz": "410525eb87a3372346072c43bab000de3efdbe31e569cf4e477508dc6a514b40",
+    "mkbrr_1.25.1_freebsd_x86_64.tar.gz": "dd1a8e265263359f51605085423ba1e8214ae852fdb49c4de6c0b2f9b6543788",
+    "mkbrr_1.25.1_linux_arm.tar.gz": "3d59ba8b78cf60471f092e3bdc2eb3b53387259873a935dab66af88f78707e40",
+    "mkbrr_1.25.1_linux_arm64.tar.gz": "6cd2347406c7b2f03a12d240022c9f2d23684c336a3802e5706a6ea3e360552d",
+    "mkbrr_1.25.1_linux_x86_64.tar.gz": "a48a3032fad09c033918a6e7a712eb45069b2a2f02546f8672768b19991bbb3b",
+    "mkbrr_1.25.1_windows_x86_64.zip": "2a1ca85148d558b680d16d37e3c83b03883494b3445f82f3fd5fd97a4cbe928f",
+}

upload_assistant-4.2/bin/binary_dependency_pins/nyuu.py

@@ -0,0 +1,10 @@
+"""Release and integrity pins for Nyuu."""
+
+VERSION = "v0.4.2"
+REPOSITORY = "animetosho/Nyuu"
+SHA256_BY_ASSET = {
+    "nyuu-v0.4.2-linux-aarch64.tar.xz": "8a94f3f775996e4469736494074ac7663ff463748b0e302c2bc13d0ff4a88c0b",
+    "nyuu-v0.4.2-linux-amd64.tar.xz": "bbea69ffaf1d8ed3465935157e3842fe7a38bade2703504879eb8bc7c0a83dff",
+    "nyuu-v0.4.2-macos-x64.tar.xz": "040c56a486bc4ac7e3b0eed7a482ffce1bbf747ff731ad45ffd99d7230fcb2a0",
+    "nyuu-v0.4.2-win32.7z": "b14eb105e064ec2bd8f6d872c1c652a9943ea54d767c80554617f4eff6c801b8",
+}

upload_assistant-4.2/bin/binary_dependency_pins/par2.py

@@ -0,0 +1,12 @@
+"""Release and integrity pins for par2."""
+
+VERSION = "v1.5.0"
+REPOSITORY = "animetosho/par2cmdline-turbo"
+SHA256_BY_ASSET = {
+    "par2cmdline-turbo-1.5.0-linux-amd64.zip": "5a9f64386813456693c2ea1fb7649436fe7544bbdf97fd73b3483dfcc8aca464",
+    "par2cmdline-turbo-1.5.0-linux-arm64.zip": "3afb2f0b319fc4e6353c6d4261994757cbe3189f968a72420b4ba1d63f9c9a70",
+    "par2cmdline-turbo-1.5.0-macos-amd64.zip": "3786d7c947ecb8048d688e0fdca3a4ce7e945d2bd248f54523ecc8d086e143cd",
+    "par2cmdline-turbo-1.5.0-macos-arm64.zip": "d016436356ef706c50ad5a4ee6316eef8138ab8d8177732ab97b9c2ad95b0990",
+    "par2cmdline-turbo-1.5.0-win-arm64.zip": "bb73312747b706dcedd13b8d4de7acd20e17367ebb0b26ebc3ea7d55ea744735",
+    "par2cmdline-turbo-1.5.0-win-x64.zip": "873a6f25822415f432224cc6f734407ca2732004184e002960fc68ed1e99c5d7",
+}

upload_assistant-4.2/bin/binary_dependency_pins/pesto.py

@@ -0,0 +1,8 @@
+"""Release and integrity pins for pesto."""
+
+VERSION = "pesto-v0.10.4"
+REPOSITORY = "franzopl/pesto"
+SHA256_BY_ASSET = {
+    "pesto-linux-x86_64": "99d78f64f7876f79a34ef252be66d672e3f0cfad150c33b8f65b79ef3d1007f8",
+    "pesto-windows-x86_64.exe": "dcca9067f0ff70a49cc65bba7b00738c2a76e65d64a8381fb815e761dbdd53c4",
+}

upload_assistant-4.2/bin/binary_dependency_pins/seven_zip.py

@@ -0,0 +1,11 @@
+"""Release and integrity pins for 7zip."""
+
+VERSION = "26.03"
+REPOSITORY = "ip7z/7zip"
+SHA256_BY_ASSET = {
+    "7z2603-linux-arm.tar.xz": "4efd099f6112b39054faea9424ded044b7bcaaf494dba49b918daa781297f57f",
+    "7z2603-linux-arm64.tar.xz": "2389ba20e4d8295e8709c20b6263b69bd1ec4972fe38a04ad7a1badbf595b996",
+    "7z2603-linux-x64.tar.xz": "dc99eff5008f1ab79bd7084c68513701547a808a89502bf4133683535ab3c695",
+    "7z2603-mac.tar.xz": "5ca87677072c59f5602e5c49baa27d4694bacd2259b4e507f0094249d4281480",
+    "7zr.exe": "ad4c82fadcbdf93c03b4fc440f300509c7d60c5c2f4d183e35d9d70d6957037d",
+}

upload_assistant-4.2/bin/download_integrity.py

@@ -0,0 +1,43 @@
+"""Pinned SHA-256 verification for third-party executable downloads."""
+
+import hashlib
+from pathlib import Path
+
+from bin.binary_dependencies import DEPENDENCY_CHECKSUMS
+
+SHA256_BY_ASSET = {
+    "MediaInfo_CLI_23.04_Windows_x64.zip": "b1beafae0a15168ca37db8a3061d55eba55c1a120d6a6423ac1d3f30ed869270",
+    "MediaInfo_CLI_26.05_Lambda_arm64.zip": "57268dcfc044cdcbe4641e26432392f002b7fa4bcb06e9d738be04cd047a2c1e",
+    "MediaInfo_CLI_26.05_Lambda_x86_64.zip": "1ae3744a78c93492b69f0b38bb2d1de1433c3eae04030ff1ea82ee1f60ac9a99",
+    "MediaInfo_CLI_26.05_Mac.dmg": "507605a7c8f1054a6996d99a4ef5b5a0711cfbf2f8ca2ef5161d6ee701ea8015",
+    "MediaInfo_CLI_26.05_Windows_ARM64.zip": "6b403fa1411730672adefa8d49d97cbf7163eed7fc5c1256c9a6e9f915fde1a8",
+    "MediaInfo_CLI_26.05_Windows_x64.zip": "f7f80620ce6d14f4995f0de6f98e3ef18ad29496db01899571152ee3311229f9",
+    "mkbrr_1.18.0_linux_arm.tar.gz": "f622595f6afee302c72c89abdd9f31ad3197bd85d45a8b482f97ebd21930ac51",
+    "mkbrr_1.18.0_linux_arm64.tar.gz": "1c187ab2b860e637296d6f0deb4c2e7754a4c1e249b0226f0be671170689de24",
+    "mkbrr_1.18.0_linux_x86_64.tar.gz": "a796bd97dfb093e18a1a509c8986580498e65253582983a462b977b359f987b9",
+}
+
+for dependency, checksums in DEPENDENCY_CHECKSUMS.items():
+    if duplicates := SHA256_BY_ASSET.keys() & checksums.keys():
+        raise RuntimeError(f"Duplicate checksum pins for {dependency}: {', '.join(sorted(duplicates))}")
+    SHA256_BY_ASSET.update(checksums)
+
+
+def verify_downloaded_asset(path: Path, asset: str) -> None:
+    """Fail closed unless a downloaded executable archive matches its pinned hash."""
+    expected = SHA256_BY_ASSET.get(asset)
+    if expected is None:
+        raise RuntimeError(f"No SHA-256 checksum is pinned for {asset}")
+    with path.open("rb") as asset_file:
+        actual = hashlib.file_digest(asset_file, "sha256").hexdigest()
+    if actual != expected:
+        raise RuntimeError(f"SHA-256 checksum mismatch for {asset}")
+
+
+def verify_downloaded_content(content: bytes, asset: str) -> None:
+    """Fail closed unless downloaded content matches its pinned hash."""
+    expected = SHA256_BY_ASSET.get(asset)
+    if expected is None:
+        raise RuntimeError(f"No SHA-256 checksum is pinned for {asset}")
+    if hashlib.sha256(content).hexdigest() != expected:
+        raise RuntimeError(f"SHA-256 checksum mismatch for {asset}")

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_7z.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -30,9 +31,10 @@ class SevenZipBinaryManager:
     """Download 7-Zip binaries for the host architecture."""
 
     @staticmethod
-    async def ensure_7z_binary(base_dir: str | Path, version: str = "26.01") -> str:
+    async def ensure_7z_binary(base_dir: str | Path, version: str = DEPENDENCY_VERSIONS["7zip"]) -> str:
         system = platform.system().lower()
         machine = platform.machine().lower()
+        asset_version = version.replace(".", "")
         logger.debug(f"[blue]7-Zip: Detected system: {system}, architecture: {machine}[/blue]")
 
         platform_map: dict[str, dict[str, dict[str, str]]] = {
@@ -43,18 +45,18 @@ class SevenZipBinaryManager:
                 "arm64": {"file": "7zr.exe", "folder": "windows/arm64"},
             },
             "darwin": {
-                "arm64": {"file": "7z2601-mac.tar.xz", "folder": "macos/arm64"},
-                "x86_64": {"file": "7z2601-mac.tar.xz", "folder": "macos/x86_64"},
-                "amd64": {"file": "7z2601-mac.tar.xz", "folder": "macos/x86_64"},
+                "arm64": {"file": f"7z{asset_version}-mac.tar.xz", "folder": "macos/arm64"},
+                "x86_64": {"file": f"7z{asset_version}-mac.tar.xz", "folder": "macos/x86_64"},
+                "amd64": {"file": f"7z{asset_version}-mac.tar.xz", "folder": "macos/x86_64"},
             },
             "linux": {
-                "x86_64": {"file": "7z2601-linux-x64.tar.xz", "folder": "linux/amd64"},
-                "amd64": {"file": "7z2601-linux-x64.tar.xz", "folder": "linux/amd64"},
-                "arm64": {"file": "7z2601-linux-arm64.tar.xz", "folder": "linux/arm64"},
-                "aarch64": {"file": "7z2601-linux-arm64.tar.xz", "folder": "linux/arm64"},
-                "arm": {"file": "7z2601-linux-arm.tar.xz", "folder": "linux/arm"},
-                "armv7l": {"file": "7z2601-linux-arm.tar.xz", "folder": "linux/arm"},
-                "armv6l": {"file": "7z2601-linux-arm.tar.xz", "folder": "linux/arm"},
+                "x86_64": {"file": f"7z{asset_version}-linux-x64.tar.xz", "folder": "linux/amd64"},
+                "amd64": {"file": f"7z{asset_version}-linux-x64.tar.xz", "folder": "linux/amd64"},
+                "arm64": {"file": f"7z{asset_version}-linux-arm64.tar.xz", "folder": "linux/arm64"},
+                "aarch64": {"file": f"7z{asset_version}-linux-arm64.tar.xz", "folder": "linux/arm64"},
+                "arm": {"file": f"7z{asset_version}-linux-arm.tar.xz", "folder": "linux/arm"},
+                "armv7l": {"file": f"7z{asset_version}-linux-arm.tar.xz", "folder": "linux/arm"},
+                "armv6l": {"file": f"7z{asset_version}-linux-arm.tar.xz", "folder": "linux/arm"},
             },
         }
 

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_bdinfo.py

@@ -11,6 +11,7 @@ from pathlib import Path
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -35,7 +36,7 @@ class BDInfoBinaryManager:
     """
 
     @staticmethod
-    async def ensure_bdinfo_binary(base_dir: str | Path, version: str = "v0.4.0") -> str:
+    async def ensure_bdinfo_binary(base_dir: str | Path, version: str = DEPENDENCY_VERSIONS["bdinfo"]) -> str:
         system = platform.system().lower()
         machine = platform.machine().lower()
         logger.debug(f"[blue]Detected system: {system}, architecture: {machine}[/blue]")

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_bdinfo_docker.py

@@ -15,6 +15,7 @@ import requests
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -32,7 +33,7 @@ except ImportError:
     logger = logging.getLogger(__name__)
 
 
-BDINFO_VERSION = "v0.4.0"
+BDINFO_VERSION = DEPENDENCY_VERSIONS["bdinfo"]
 BASE_RELEASE_URL = "https://github.com/autobrr/go-bdinfo/releases/download"
 
 

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_dynamic_hdr_tools.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-import hashlib
 import platform
 import shutil
 import stat
@@ -13,24 +12,13 @@ from pathlib import Path
 
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
+from bin.download_integrity import verify_downloaded_content
 from src.console import logger
 
 TOOLS = {
-    "dovi": {"command": "dovi_tool", "repository": "quietvoid/dovi_tool", "version": "2.3.3"},
-    "hdr10plus": {"command": "hdr10plus_tool", "repository": "quietvoid/hdr10plus_tool", "version": "1.7.2"},
-}
-
-ASSET_SHA256 = {
-    "dovi_tool-2.3.3-aarch64-pc-windows-msvc.zip": "559ed634ef0b956ab89ed965b4920371bb228983f105d99fafeb372a8190c872",
-    "dovi_tool-2.3.3-aarch64-unknown-linux-musl.tar.gz": "daf538c275f4e702219ce8eb61db28382193ac9d0126e1ef4185a88303af4485",
-    "dovi_tool-2.3.3-universal-macOS.zip": "b113c83fed2d8d7ed9e43f0428d02fa0d0030e20965fc24a3cd4d48597d88685",
-    "dovi_tool-2.3.3-x86_64-pc-windows-msvc.zip": "37ae198f2a535c910befad39fc09c21cded76bf3ef2d5459d542e58c2c158311",
-    "dovi_tool-2.3.3-x86_64-unknown-linux-musl.tar.gz": "5dae82cb2becd3b9fd726127f936a8d32635e60746d16238fdfded12aa05988c",
-    "hdr10plus_tool-1.7.2-aarch64-pc-windows-msvc.zip": "0cc1cd6ae9fb1115e5dc3d1f6daed47c486410ad5731f60a298e5d78fe995d6b",
-    "hdr10plus_tool-1.7.2-aarch64-unknown-linux-musl.tar.gz": "5fb90607cd94296640f1fc2355207b8107b67baac96d37481423d08a9fce437d",
-    "hdr10plus_tool-1.7.2-universal-macOS.zip": "d76977ed2ea90f8d6bce9035e37ea9dbffcead4725ceb1acf455c25d8658ff28",
-    "hdr10plus_tool-1.7.2-x86_64-pc-windows-msvc.zip": "82b2d560073941b14c6511a431f429e33e134e5caefb60d7e8f6f6e6da8e16ba",
-    "hdr10plus_tool-1.7.2-x86_64-unknown-linux-musl.tar.gz": "06385f37a639d61ba21d4be3150c863846933bc3b58110e094d8fc8f1c2249f2",
+    "dovi": {"command": "dovi_tool", "repository": "quietvoid/dovi_tool", "version": DEPENDENCY_VERSIONS["dovi_tool"]},
+    "hdr10plus": {"command": "hdr10plus_tool", "repository": "quietvoid/hdr10plus_tool", "version": DEPENDENCY_VERSIONS["hdr10plus_tool"]},
 }
 
 
@@ -50,11 +38,7 @@ def _asset_name(tool: str) -> tuple[str, str]:
 
 def _verify_checksum(asset: str, content: bytes) -> None:
     """Reject release assets whose content differs from the pinned digest."""
-    expected_checksum = ASSET_SHA256.get(asset)
-    if expected_checksum is None:
-        raise RuntimeError(f"Missing checksum for {asset}")
-    if hashlib.sha256(content).hexdigest() != expected_checksum:
-        raise RuntimeError(f"Checksum mismatch for {asset}")
+    verify_downloaded_content(content, asset)
 
 
 def _safe_extract(archive: Path, destination: Path) -> None:

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_ffmpeg.py

@@ -11,6 +11,7 @@ from pathlib import Path
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 from src.console import logger
 
@@ -18,8 +19,8 @@ from src.console import logger
 class FfmpegBinaryManager:
     """Download the verified Windows FFmpeg build into the runtime ``bin`` cache."""
 
-    VERSION = "9.0.1"
-    ASSET_NAME = "ffmpeg-9.0.1-essentials_build.zip"
+    VERSION = DEPENDENCY_VERSIONS["ffmpeg"]
+    ASSET_NAME = f"ffmpeg-{VERSION}-essentials_build.zip"
     DOWNLOAD_URL = f"https://github.com/GyanD/codexffmpeg/releases/download/{VERSION}/{ASSET_NAME}"
 
     @classmethod

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_mkbrr.py

@@ -11,6 +11,7 @@ from typing import ClassVar
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -77,7 +78,7 @@ class MkbrrBinaryManager:
         return shutil.which("mkbrr")
 
     @staticmethod
-    async def ensure_mkbrr_binary(base_dir: str | Path, version: str) -> str:
+    async def ensure_mkbrr_binary(base_dir: str | Path, version: str = DEPENDENCY_VERSIONS["mkbrr"]) -> str:
         existing_binary = MkbrrBinaryManager.find_existing_binary(base_dir, version)
         if existing_binary:
             return existing_binary
@@ -235,7 +236,7 @@ class MkbrrBinaryManager:
             raise Exception(f"Failed to extract mkbrr binary: {e}") from e
 
     @staticmethod
-    def download_mkbrr_for_docker(base_dir: str | Path = ".", version: str = "v1.18.0") -> str:
+    def download_mkbrr_for_docker(base_dir: str | Path = ".", version: str = DEPENDENCY_VERSIONS["mkbrr"]) -> str:
         """Download mkbrr binary for Docker/Linux - synchronous version."""
         system = platform.system().lower()
         machine = platform.machine().lower()

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_nyuu.py

@@ -10,6 +10,7 @@ from pathlib import Path
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -31,28 +32,28 @@ class NyuuBinaryManager:
     """Download Nyuu binaries for the host architecture."""
 
     @staticmethod
-    async def ensure_nyuu_binary(base_dir: str | Path, path_7z: str | None = None, version: str = "v0.4.2") -> str:
+    async def ensure_nyuu_binary(base_dir: str | Path, path_7z: str | None = None, version: str = DEPENDENCY_VERSIONS["nyuu"]) -> str:
         system = platform.system().lower()
         machine = platform.machine().lower()
         logger.debug(f"[blue]Nyuu: Detected system: {system}, architecture: {machine}[/blue]")
 
         platform_map: dict[str, dict[str, dict[str, str]]] = {
             "windows": {
-                "x86_64": {"file": "nyuu-v0.4.2-win32.7z", "folder": "windows/x86_64"},
-                "amd64": {"file": "nyuu-v0.4.2-win32.7z", "folder": "windows/x86_64"},
-                "x86": {"file": "nyuu-v0.4.2-win32.7z", "folder": "windows/x86"},
-                "arm64": {"file": "nyuu-v0.4.2-win32.7z", "folder": "windows/arm64"},
+                "x86_64": {"file": f"nyuu-{version}-win32.7z", "folder": "windows/x86_64"},
+                "amd64": {"file": f"nyuu-{version}-win32.7z", "folder": "windows/x86_64"},
+                "x86": {"file": f"nyuu-{version}-win32.7z", "folder": "windows/x86"},
+                "arm64": {"file": f"nyuu-{version}-win32.7z", "folder": "windows/arm64"},
             },
             "darwin": {
-                "arm64": {"file": "nyuu-v0.4.2-macos-x64.tar.xz", "folder": "macos/arm64"},
-                "x86_64": {"file": "nyuu-v0.4.2-macos-x64.tar.xz", "folder": "macos/x86_64"},
-                "amd64": {"file": "nyuu-v0.4.2-macos-x64.tar.xz", "folder": "macos/x86_64"},
+                "arm64": {"file": f"nyuu-{version}-macos-x64.tar.xz", "folder": "macos/arm64"},
+                "x86_64": {"file": f"nyuu-{version}-macos-x64.tar.xz", "folder": "macos/x86_64"},
+                "amd64": {"file": f"nyuu-{version}-macos-x64.tar.xz", "folder": "macos/x86_64"},
             },
             "linux": {
-                "x86_64": {"file": "nyuu-v0.4.2-linux-amd64.tar.xz", "folder": "linux/amd64"},
-                "amd64": {"file": "nyuu-v0.4.2-linux-amd64.tar.xz", "folder": "linux/amd64"},
-                "arm64": {"file": "nyuu-v0.4.2-linux-aarch64.tar.xz", "folder": "linux/arm64"},
-                "aarch64": {"file": "nyuu-v0.4.2-linux-aarch64.tar.xz", "folder": "linux/arm64"},
+                "x86_64": {"file": f"nyuu-{version}-linux-amd64.tar.xz", "folder": "linux/amd64"},
+                "amd64": {"file": f"nyuu-{version}-linux-amd64.tar.xz", "folder": "linux/amd64"},
+                "arm64": {"file": f"nyuu-{version}-linux-aarch64.tar.xz", "folder": "linux/arm64"},
+                "aarch64": {"file": f"nyuu-{version}-linux-aarch64.tar.xz", "folder": "linux/arm64"},
             },
         }
 

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_par2.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -30,12 +31,12 @@ class Par2BinaryManager:
     """Download par2cmdline-turbo binaries for the host architecture."""
 
     @staticmethod
-    async def ensure_par2_binary(base_dir: str | Path, version: str = "v1.4.0") -> str:
+    async def ensure_par2_binary(base_dir: str | Path, version: str = DEPENDENCY_VERSIONS["par2"]) -> str:
         system = platform.system().lower()
         machine = platform.machine().lower()
         logger.debug(f"[blue]PAR2: Detected system: {system}, architecture: {machine}[/blue]")
 
-        # Strip 'v' from version for URLs if needed, but the tag is v1.4.0, while filenames have 1.4.0
+        # Release tags include "v", while asset filenames use the numeric version.
         v_num = version.lstrip("v")
 
         platform_map: dict[str, dict[str, dict[str, str]]] = {

{upload_assistant-4.1 → upload_assistant-4.2}/bin/get_pesto.py

@@ -8,6 +8,7 @@ from pathlib import Path
 import aiofiles
 import httpx
 
+from bin.binary_dependencies import DEPENDENCY_VERSIONS
 from bin.download_integrity import verify_downloaded_asset
 
 try:
@@ -29,7 +30,7 @@ class PestoBinaryManager:
     """Download Pesto binaries for the host architecture."""
 
     @staticmethod
-    async def ensure_pesto_binary(base_dir: str | Path, version: str = "pesto-v0.6.0") -> str:
+    async def ensure_pesto_binary(base_dir: str | Path, version: str = DEPENDENCY_VERSIONS["pesto"]) -> str:
         system = platform.system().lower()
         machine = platform.machine().lower()
         logger.debug(f"[blue]Pesto: Detected system: {system}, architecture: {machine}[/blue]")

{upload_assistant-4.1 → upload_assistant-4.2}/data/example_config.py

@@ -299,11 +299,25 @@ config: dict[str, Any] = {
         # Works only when the input frame has a supported color tag.
         "desat": "10.0",
         # Screenshot overlays
-        # Set to True to overlay the frame number, frame type, and "Tonemapped" label when applicable.
+        # Layout examples and manual setup: docs/screenshot-overlays.md
+        # Show enabled screenshot labels without changing the individual selections below.
+        # Enable at least one label below to display overlay text.
         # Enabling overlays uses FFmpeg tone mapping instead of libplacebo.
         "frame_overlay": False,
-        # Overlay text size, scaled with resolution.
+        # Overlay text size (1-100), scaled with resolution. VapourSynth rounds to whole font-scale steps.
         "overlay_text_size": "18",
+        # Keep labels at the top, aligned to "left" or "right".
+        "overlay_position": "left",
+        # Use "stacked" for one label per line, or "single_line" for compact labels separated by bullets.
+        "overlay_layout": "stacked",
+        # Show the estimated frame number at the capture position.
+        "overlay_frame_number": False,
+        # Show the frame's picture type (I, P, or B).
+        "overlay_frame_type": False,
+        # Show the captured frame's elapsed video time (HH:MM:SS.mmm).
+        "overlay_timestamp": False,
+        # Show only when screenshots have been tonemapped to SDR.
+        "overlay_tonemapped": False,
         # --- DISC MENU SCREENSHOTS ---
         # Set to True to capture DVD menu screenshots from menu VOBs.
         "auto_dvd_menus": True,
@@ -524,7 +538,7 @@ config: dict[str, Any] = {
         #   BRASILTRACKER, BROADCASTHENET, CAPYBARABR, CATHODERAYTUBE, CINEMATIK, CINEMAZ, CURUPIRA, DARKPEERS, DESITORRENTS, DIGITALCORE,
         #   DREADVAULT, DRUNKENSLUG, EMUWAREZ, FILELIST, FLOOD, FUNFILE, GREATPOSTERWALL, HAWKEUNO, HDBITS, HDSPACE, HDTORRENTS, HOMIEHELPDESK,
         #   IMMORTALSEED, INFINITYHD, IPTORRENTS, ITATORRENTS, LAJIDUI, LASTDIGITALUNDERGROUND, LATTEAM, LEMONHD, LOCADORA, LONGPT, LST,
-        #   LUMINARR, MAKINGOFF, MIDNIGHTSCENE, MTEAM, NEBULANCE, NORDICQUALITY, NZBGEEK, OLDTOONSWORLD, ONLYENCODES, ORPHEUS, PASSTHEPOPCORN,
+        #   LUMINARR, MAKINGOFF, MIDNIGHTSCENE, MTEAM, NEBULANCE, NORDICQUALITY, NZBGEEK, NZBNEST, OLDTOONSWORLD, ONLYENCODES, ORPHEUS, PASSTHEPOPCORN,
         #   PEERGARDEN, POLISHTORRENT, PORTUGAS, PRIVATEHD, PTCAFE, PTERCLUB, PTFANS, PTGTK, PTSKIT, PTZONE, RACING4EVERYONE, RAILGUNPT,
         #   RASTASTUGAN, REELFLIX, RETROFLIX, RETROMOVIESCLUB, ROCKETHD, SAMARITANO, SEEDPOOL, SHAREISLAND, SKIPTHECOMMERCIALS, SPEEDAPP,
         #   SUIO, SWARMAZON, THELEACHZONE, THEOLDSCHOOL, TORRENTEROS, TORRENTHR, TORRENTLEECH, TOTHEGLORY, TVCHAOSUK, ULCX, UTOPIA,
@@ -1162,6 +1176,8 @@ config: dict[str, Any] = {
             # You can find your api key at Settings -> Security -> API Key -> Generate API Key
             "api_key": "",
             "anon": True,
+            # Force DigitalCore uploads to re-host screenshots on img.digitalcore.club using DEFAULT.sharex_api_key.
+            "force_rehost_images": False,
             # If True, the script will use the metadata-based title instead of the directory/file name.
             "use_metadata_name": False,
             # The configurations below override the DEFAULT configuration
@@ -2115,6 +2131,16 @@ config: dict[str, Any] = {
             "exact_match_only": False,
             "inject_delay": 0,
         },
+        "NZBNEST": {
+            # NzbNest API key
+            "api_key": "",
+            # Maximum number of API hits the script may make within 24 hours for duplicate search.
+            # Set to 0 to disable duplicate search via API.
+            "daily_api_hit_limit": 0,
+            # Only block uploads when the existing release exactly matches files.
+            "exact_match_only": False,
+            "inject_delay": 0,
+        },
         "OLDTOONSWORLD": {
             # Instead of using the tracker acronym for folder name when sym/hard linking, you can use a custom name
             "link_dir_name": "",
@@ -2809,6 +2835,7 @@ config: dict[str, Any] = {
             # "use_for_search": False, set to True if using this tracker for automatic ID searching or description parsing
             "use_for_search": False,
             "api_key": "",
+            "anon": True,
             # Only block uploads when the existing release exactly matches files and size.
             "exact_match_only": False,
             # For authorized users only. Do not change this unless you know what you are doing
@@ -3125,6 +3152,7 @@ config: dict[str, Any] = {
             # "use_for_search": False, set to True if using this tracker for automatic ID searching or description parsing
             "use_for_search": False,
             "api_key": "",
+            "anon": True,
             # For authorized users only. Do not change this unless you know what you are doing
             # Upload as featured
             "featured": False,

{upload_assistant-4.1 → upload_assistant-4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "upload-assistant"
-version = "4.1"
+version = "4.2"
 requires-python = ">=3.14"
 description = "A simple tool to take the work out of uploading."
 readme = "README.md"