kryten-webqueue 0.2.4__tar.gz → 0.2.6__tar.gz

{kryten_webqueue-0.2.4 → kryten_webqueue-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryten-webqueue
-Version: 0.2.4
+Version: 0.2.6
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT

{kryten_webqueue-0.2.4 → kryten_webqueue-0.2.6}/kryten_webqueue/catalog/sync.py

@@ -1,10 +1,30 @@
 import httpx
 import logging
 from datetime import datetime, UTC
+from urllib.parse import urlparse
 
 logger = logging.getLogger(__name__)
 
 
+def _describe_httpx_error(exc: Exception, url: str) -> str:
+    """Return a human-readable description of an httpx network error."""
+    host = urlparse(url).netloc or url
+    if isinstance(exc, httpx.ConnectTimeout):
+        return f"Connection to {host} timed out — check host/port and firewall"
+    if isinstance(exc, httpx.ConnectError):
+        cause = str(exc.__cause__ or exc).lower()
+        if "name or service not known" in cause or "nodename nor servname" in cause or "getaddrinfo" in cause:
+            return f"DNS lookup failed for {host} — check mediacms_url in config"
+        if "connection refused" in cause:
+            return f"Connection refused by {host} — service may be down"
+        return f"Could not connect to {host}: {exc.__cause__ or exc}"
+    if isinstance(exc, httpx.ReadTimeout):
+        return f"Read timed out waiting for response from {host}"
+    if isinstance(exc, httpx.TimeoutException):
+        return f"Request to {host} timed out"
+    return f"{type(exc).__name__} connecting to {host}: {exc}"
+
+
 class CatalogSync:
     """Synchronizes catalog data from MediaCMS."""
 
@@ -32,12 +52,19 @@ class CatalogSync:
         stats = {"seen": 0, "new": 0, "updated": 0, "errors": 0}
 
         try:
-            page = 1
-            while True:
-                resp = await self._client.get(
-                    f"{self._url}/api/v1/media",
-                    params={"page": page, "page_size": 50},
-                )
+            next_url: str | None = f"{self._url}/api/v1/media"
+            params: dict = {"page_size": 50}
+            page = 0
+
+            while next_url:
+                page += 1
+                try:
+                    resp = await self._client.get(next_url, params=params if page == 1 else None)
+                except httpx.TransportError as exc:
+                    logger.error(_describe_httpx_error(exc, next_url))
+                    stats["errors"] += 1
+                    break
+
                 if resp.status_code != 200:
                     logger.error(
                         f"MediaCMS API returned {resp.status_code} for URL {resp.url} — "
@@ -60,15 +87,18 @@ class CatalogSync:
                         logger.warning(f"Error processing {media.get('friendly_token')}: {e}")
                         stats["errors"] += 1
 
-                # Check for next page
-                if isinstance(data, dict) and not data.get("next"):
-                    break
-                page += 1
+                # Follow the next URL from the response — don't construct it ourselves
+                next_url = data.get("next") if isinstance(data, dict) else None
+                logger.debug(f"Catalog sync page {page}: seen={stats['seen']} next={next_url!r}")
 
             await self._db.finish_sync_log(log_id, stats, "completed")
-            logger.info(f"Catalog sync: {stats}")
-        except Exception as e:
-            logger.exception(f"Catalog sync failed: {type(e).__name__}: {e}")
+            logger.info(f"Catalog sync complete: {stats} ({page} pages)")
+        except httpx.TransportError as exc:
+            logger.error(_describe_httpx_error(exc, f"{self._url}/api/v1/media"))
+            stats["errors"] += 1
+            await self._db.finish_sync_log(log_id, stats, "error")
+        except Exception as exc:
+            logger.exception(f"Catalog sync failed: {type(exc).__name__}: {exc}")
             stats["errors"] += 1
             await self._db.finish_sync_log(log_id, stats, "error")
 

{kryten_webqueue-0.2.4 → kryten_webqueue-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryten-webqueue"
-version = "0.2.4"
+version = "0.2.6"
 description = "Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube"
 readme = "README.md"
 license = "MIT"