unit3dprep 1.0.6__tar.gz → 1.1.1__tar.gz

{unit3dprep-1.0.6/unit3dprep.egg-info → unit3dprep-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unit3dprep
-Version: 1.0.6
+Version: 1.1.1
 Summary: Web UI + CLI di pre-flight per tracker Unit3D, companion di Unit3DWebUp (audio ITA, nomenclatura ItaTorrents, hardlink, upload)
 Author: Davide Sidoti
 License: GNU GENERAL PUBLIC LICENSE
@@ -723,7 +723,7 @@ Dynamic: license-file
 ![GitHub Pages](https://img.shields.io/badge/GitHub%20Pages-222222?style=for-the-badge&logo=github%20Pages&logoColor=white)
 
 [![PyPI](https://img.shields.io/pypi/v/unit3dprep?style=for-the-badge&logo=pypi&logoColor=white&label=PyPI)](https://pypi.org/project/unit3dprep/)
-[![Docker Hub](https://img.shields.io/docker/v/hashdeveloper512/unit3dprep?style=for-the-badge&logo=docker&logoColor=white&label=Docker%20Hub&sort=semver)](https://hub.docker.com/r/hashdeveloper512/unit3dprep)
+[![Docker Hub](https://img.shields.io/badge/Docker-2CA5E0?style=for-the-badge&logo=docker&logoColor=white)](https://hub.docker.com/r/hashdeveloper512/unit3dprep)
 
 Web UI + CLI di pre-flight per tracker Unit3D, accoppiata via HTTP a [`Unit3DWebUp`](https://pypi.org/project/Unit3DwebUp/) come backend di upload.
 Verifica tracce audio italiane, rinomina secondo la [nomenclatura ItaTorrents](docs/nomenclatura.md), crea hardlink in `~/seedings/` e orchestra il flusso `setenv → scan → maketorrent → upload → seed` su `Unit3DWebUp` con log live via WebSocket/SSE.

{unit3dprep-1.0.6 → unit3dprep-1.1.1}/README.md

@@ -9,7 +9,7 @@
 ![GitHub Pages](https://img.shields.io/badge/GitHub%20Pages-222222?style=for-the-badge&logo=github%20Pages&logoColor=white)
 
 [![PyPI](https://img.shields.io/pypi/v/unit3dprep?style=for-the-badge&logo=pypi&logoColor=white&label=PyPI)](https://pypi.org/project/unit3dprep/)
-[![Docker Hub](https://img.shields.io/docker/v/hashdeveloper512/unit3dprep?style=for-the-badge&logo=docker&logoColor=white&label=Docker%20Hub&sort=semver)](https://hub.docker.com/r/hashdeveloper512/unit3dprep)
+[![Docker Hub](https://img.shields.io/badge/Docker-2CA5E0?style=for-the-badge&logo=docker&logoColor=white)](https://hub.docker.com/r/hashdeveloper512/unit3dprep)
 
 Web UI + CLI di pre-flight per tracker Unit3D, accoppiata via HTTP a [`Unit3DWebUp`](https://pypi.org/project/Unit3DwebUp/) come backend di upload.
 Verifica tracce audio italiane, rinomina secondo la [nomenclatura ItaTorrents](docs/nomenclatura.md), crea hardlink in `~/seedings/` e orchestra il flusso `setenv → scan → maketorrent → upload → seed` su `Unit3DWebUp` con log live via WebSocket/SSE.

{unit3dprep-1.0.6 → unit3dprep-1.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unit3dprep"
-version = "1.0.6"
+version = "1.1.1"
 description = "Web UI + CLI di pre-flight per tracker Unit3D, companion di Unit3DWebUp (audio ITA, nomenclatura ItaTorrents, hardlink, upload)"
 readme = "README.md"
 license = { file = "LICENSE" }

{unit3dprep-1.0.6 → unit3dprep-1.1.1}/unit3dprep/i18n.py

@@ -68,9 +68,9 @@ CATALOG: dict[str, dict[str, str]] = {
         "it": "Tracker sconosciuto '{tracker}'",
         "en": "Unknown tracker '{tracker}'",
     },
-    "err.reseed_not_implemented": {
-        "it": "Reseed per tracker id non implementato",
-        "en": "Reseed by tracker id not implemented",
+    "err.reseed_session_expired": {
+        "it": "Sessione reseed non trovata o scaduta",
+        "en": "Reseed session not found or expired",
     },
     "err.record_not_found": {
         "it": "Record non trovato",

unit3dprep-1.1.1/unit3dprep/web/api/reseed.py

@@ -0,0 +1,142 @@
+"""Reseed endpoints: discover 0-seed ITT torrents already on disk and re-seed.
+
+- `GET  /api/reseed/scan`     — SSE, batched candidate discovery (library↔ITT)
+- `GET  /api/reseed/suggest`  — torrent meta + size-matched local files (manual)
+- `POST /api/reseed/start`    — create a reseed session, returns a token
+- `GET  /api/reseed/{tok}/run`— SSE, run the reseed (download → qBit → hardlink → recheck)
+"""
+from __future__ import annotations
+
+import asyncio
+import json
+import secrets
+import time
+from pathlib import Path
+from typing import Any, AsyncGenerator
+
+from fastapi import APIRouter, HTTPException, Request
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel
+from sse_starlette.sse import EventSourceResponse
+
+from ...i18n import get_request_lang, t as _i18n_t
+from ...media import media_root, seedings_root
+from .. import config as web_config
+from ..logbuf import emit as log_emit
+from ..reseed import perform_reseed, stream_reseed_candidates, suggest_local_files
+
+router = APIRouter(prefix="/api", tags=["reseed"])
+
+_sessions: dict[str, dict[str, Any]] = {}
+_created: dict[str, float] = {}
+_TTL = 3600
+
+
+def _cleanup() -> None:
+    now = time.time()
+    for tok in [t for t, ct in _created.items() if now - ct > _TTL]:
+        _sessions.pop(tok, None)
+        _created.pop(tok, None)
+
+
+def _create(state: dict[str, Any]) -> str:
+    _cleanup()
+    tok = secrets.token_urlsafe(24)
+    _sessions[tok] = state
+    _created[tok] = time.time()
+    return tok
+
+
+def _validate_source(p: str, lang: str | None = None) -> Path:
+    resolved = Path(p).resolve()
+    allowed = [media_root().resolve(), seedings_root().resolve()]
+    if not any(str(resolved).startswith(str(a)) for a in allowed):
+        raise HTTPException(403, _i18n_t("err.path_outside", lang))
+    if not resolved.exists():
+        raise HTTPException(404, _i18n_t("err.path_not_found_at", lang, path=str(resolved)))
+    return resolved
+
+
+# ---------------------------------------------------------------------------
+# Discovery
+# ---------------------------------------------------------------------------
+
+
+@router.get("/reseed/scan")
+async def reseed_scan(category: str, offset: int = 0, limit: int = 20, max_seeders: int = 0):
+    cfg = web_config.load()
+    safe_limit = max(1, min(int(limit or 20), 100))
+    safe_offset = max(0, int(offset or 0))
+    safe_max_seeders = max(0, min(int(max_seeders or 0), 100))
+
+    async def generate() -> AsyncGenerator[dict, None]:
+        async for kind, data in stream_reseed_candidates(
+            cfg, category, offset=safe_offset, limit=safe_limit,
+            max_seeders=safe_max_seeders,
+        ):
+            yield {"event": kind, "data": json.dumps(data)}
+
+    return EventSourceResponse(generate())
+
+
+@router.get("/reseed/suggest")
+async def reseed_suggest(torrent_id: int):
+    cfg = web_config.load()
+    return JSONResponse(await suggest_local_files(cfg, torrent_id))
+
+
+# ---------------------------------------------------------------------------
+# Reseed run
+# ---------------------------------------------------------------------------
+
+
+class StartBody(BaseModel):
+    tracker: str = "ITT"
+    torrent_id: int
+    source_path: str
+    category: str = ""
+    kind: str = ""
+    title: str = ""
+
+
+@router.post("/reseed/start")
+async def reseed_start(request: Request, body: StartBody):
+    lang = get_request_lang(request)
+    src = _validate_source(body.source_path, lang)
+    state = {
+        "tracker": (body.tracker or "ITT").upper(),
+        "torrent_id": int(body.torrent_id),
+        "source_path": str(src),
+        "category": body.category,
+        "kind": body.kind,
+        "title": body.title,
+    }
+    tok = _create(state)
+    return JSONResponse({"token": tok})
+
+
+@router.get("/reseed/{tok}/run")
+async def reseed_run(tok: str, request: Request):
+    lang = get_request_lang(request)
+    state = _sessions.get(tok)
+    if state is None:
+        raise HTTPException(404, _i18n_t("err.reseed_session_expired", lang))
+    cfg = web_config.load()
+
+    async def generate() -> AsyncGenerator[dict, None]:
+        async for ev in perform_reseed(
+            cfg,
+            tracker=state["tracker"],
+            torrent_id=state["torrent_id"],
+            source_path=state["source_path"],
+            category=state.get("category", ""),
+            kind=state.get("kind", ""),
+            title=state.get("title", ""),
+        ):
+            if ev["event"] == "log":
+                log_emit("info", ev["data"], "reseed", source="reseed")
+            elif ev["event"] == "error":
+                log_emit("error", ev["data"], "reseed", source="reseed")
+            yield ev
+
+    return EventSourceResponse(generate())

{unit3dprep-1.0.6 → unit3dprep-1.1.1}/unit3dprep/web/api/search.py

@@ -32,9 +32,3 @@ async def search(request: Request, q: str, tracker: str = "ITT"):
         "tracker": tracker.upper(),
         "results": [r.to_dict() for r in results],
     })
-
-
-@router.post("/reseed/{tracker}/{torrent_id}")
-async def reseed(request: Request, tracker: str, torrent_id: int):
-    # Placeholder: trigger a unit3dup reseed run for a known torrent id.
-    raise HTTPException(501, t("err.reseed_not_implemented", get_request_lang(request)))

{unit3dprep-1.0.6 → unit3dprep-1.1.1}/unit3dprep/web/app.py

@@ -23,6 +23,7 @@ from .api import (
     logs as logs_api,
     quickupload as quickupload_api,
     queue as queue_api,
+    reseed as reseed_api,
     search as search_api,
     settings as settings_api,
     tmdb as tmdb_api,
@@ -124,6 +125,7 @@ for r in (
     logs_api.router,
     queue_api.router,
     quickupload_api.router,
+    reseed_api.router,
     search_api.router,
     settings_api.router,
     tmdb_api.router,

{unit3dprep-1.0.6 → unit3dprep-1.1.1}/unit3dprep/web/clients.py

@@ -40,6 +40,33 @@ class TorrentClient(ABC):
     @abstractmethod
     async def remove(self, torrent_hash: str, delete_files: bool = False) -> None: ...
 
+    async def add_torrent(
+        self,
+        torrent_bytes: bytes,
+        *,
+        save_path: str,
+        paused: bool = True,
+        skip_checking: bool = False,
+        category: str | None = None,
+        tags: str | None = None,
+    ) -> None:
+        raise NotImplementedError(f"{self.name} client does not support add_torrent")
+
+    async def torrent_files(self, torrent_hash: str) -> list[dict]:
+        raise NotImplementedError(f"{self.name} client does not support torrent_files")
+
+    async def info_one(self, torrent_hash: str) -> dict | None:
+        raise NotImplementedError(f"{self.name} client does not support info_one")
+
+    async def recheck(self, torrent_hash: str) -> None:
+        raise NotImplementedError(f"{self.name} client does not support recheck")
+
+    async def resume(self, torrent_hash: str) -> None:
+        raise NotImplementedError(f"{self.name} client does not support resume")
+
+    async def pause(self, torrent_hash: str) -> None:
+        raise NotImplementedError(f"{self.name} client does not support pause")
+
 
 # ---------------------------------------------------------------------------
 # qBittorrent Web API (v2)
@@ -114,11 +141,104 @@ class QBittorrentClient(TorrentClient):
         return out
 
     async def reseed(self, torrent_hash: str) -> None:
+        await self.recheck(torrent_hash)
+        await self.resume(torrent_hash)
+
+    async def add_torrent(
+        self,
+        torrent_bytes: bytes,
+        *,
+        save_path: str,
+        paused: bool = True,
+        skip_checking: bool = False,
+        category: str | None = None,
+        tags: str | None = None,
+    ) -> None:
+        """Add a .torrent (raw bytes) pointing at `save_path`.
+
+        For reseed the caller adds **paused** (so it never announces before the
+        content is in place), hardlinks the matching files into the layout qBit
+        reports via `torrent_files()`, then triggers an explicit `recheck()`.
+        Keep `skip_checking` False so the initial progress reflects reality
+        (0% until the content is hardlinked) rather than a spurious 100%. qBit's
+        add endpoint does not return the infohash; callers diff `list()`
+        before/after.
+        """
+        cli = await self._http()
+        flag = "true" if paused else "false"
+        data: dict[str, str] = {
+            "savepath": save_path,
+            # qBit 5.0 renamed the add param `paused` → `stopped`; send both so
+            # the torrent is correctly added stopped on either version (the
+            # unknown one is ignored).
+            "paused": flag,
+            "stopped": flag,
+            "skip_checking": "true" if skip_checking else "false",
+            "autoTMM": "false",
+        }
+        if category:
+            data["category"] = category
+        if tags:
+            data["tags"] = tags
+        files = {"torrents": ("reseed.torrent", torrent_bytes, "application/x-bittorrent")}
+        r = await cli.post("/api/v2/torrents/add", data=data, files=files)
+        r.raise_for_status()
+        if r.text.strip().lower() == "fails.":
+            raise RuntimeError("qBittorrent rejected the .torrent file")
+
+    async def torrent_files(self, torrent_hash: str) -> list[dict]:
+        """Files qBit expects for a torrent: ``[{name, size, ...}]``.
+
+        ``name`` is the path relative to the torrent root — the source of
+        truth for where to hardlink the local content under the save path.
+        """
+        cli = await self._http()
+        r = await cli.get("/api/v2/torrents/files", params={"hash": torrent_hash})
+        r.raise_for_status()
+        data = r.json()
+        return data if isinstance(data, list) else []
+
+    async def info_one(self, torrent_hash: str) -> dict | None:
+        """Raw qBit torrent info for a single hash (raw `state` + `progress`)."""
+        cli = await self._http()
+        r = await cli.get("/api/v2/torrents/info", params={"hashes": torrent_hash})
+        r.raise_for_status()
+        data = r.json()
+        if isinstance(data, list) and data:
+            return data[0]
+        return None
+
+    async def _torrent_action(self, paths: list[str], data: dict[str, str]) -> None:
+        """POST a torrent action tolerating the qBittorrent 5.0 endpoint rename
+        (resume→start, pause→stop): try each path in order, treat a 404 as
+        "wrong version, try the next", and surface any other error."""
+        cli = await self._http()
+        last: httpx.Response | None = None
+        for path in paths:
+            r = await cli.post(path, data=data)
+            if r.status_code != 404:
+                r.raise_for_status()
+                return
+            last = r
+        if last is not None:
+            last.raise_for_status()
+
+    async def recheck(self, torrent_hash: str) -> None:
         cli = await self._http()
         r = await cli.post("/api/v2/torrents/recheck", data={"hashes": torrent_hash})
         r.raise_for_status()
-        r2 = await cli.post("/api/v2/torrents/resume", data={"hashes": torrent_hash})
-        r2.raise_for_status()
+
+    async def resume(self, torrent_hash: str) -> None:
+        await self._torrent_action(
+            ["/api/v2/torrents/start", "/api/v2/torrents/resume"],
+            {"hashes": torrent_hash},
+        )
+
+    async def pause(self, torrent_hash: str) -> None:
+        await self._torrent_action(
+            ["/api/v2/torrents/stop", "/api/v2/torrents/pause"],
+            {"hashes": torrent_hash},
+        )
 
     async def remove(self, torrent_hash: str, delete_files: bool = False) -> None:
         cli = await self._http()