cinnamon-cli 0.2.29__tar.gz → 0.2.31__tar.gz

{cinnamon_cli-0.2.29/cinnamon_cli.egg-info → cinnamon_cli-0.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.29
+Version: 0.2.31
 Summary: CLI to search TV shows, movies & anime via TMDB/AniList, scrape m3u8 links, and play in VLC/mpv
 Author: pizza-droid
 License: CC BY-NC 4.0

cinnamon_cli-0.2.31/cinnamon/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.31"

{cinnamon_cli-0.2.29 → cinnamon_cli-0.2.31}/cinnamon/player.py

@@ -489,28 +489,31 @@ def download_video(url, title="", referer=None, output_dir=".", track_id=None):
 
     import re
     last_pct = -1
+    last_error = ""
     try:
         for line in proc.stdout:
-            if "[download]" not in line:
-                continue
-            m = re.search(r"(\d+\.?\d*)%\s+of\s+~?\s*([\d.]+)(\w+).*ETA\s+(\S+)", line)
-            if not m:
-                m = re.search(r"(\d+\.?\d*)%\s+of\s+~?\s*([\d.]+)(\w+)", line)
-            if m:
-                pct = float(m.group(1))
-                if int(pct) == last_pct:
-                    continue
-                last_pct = int(pct)
-                size_val = float(m.group(2))
-                unit = m.group(3)
-                eta = m.group(4) if m.lastindex >= 4 else ""
-                bar_width = 25
-                filled = int(bar_width * pct / 100)
-                bar = "█" * filled + "░" * (bar_width - filled)
-                eta_str = f" ETA {eta}" if eta else ""
-                print(f"\r  {bar}  {pct:>5.1f}%  {size_val:.1f}{unit}{eta_str}    ", end="", file=sys.stderr, flush=True)
-            else:
-                print(f"\r  {line.rstrip():<50}", file=sys.stderr, flush=True)
+            if "[download]" in line:
+                m = re.search(r"(\d+\.?\d*)%\s+of\s+~?\s*([\d.]+)(\w+).*ETA\s+(\S+)", line)
+                if not m:
+                    m = re.search(r"(\d+\.?\d*)%\s+of\s+~?\s*([\d.]+)(\w+)", line)
+                if m:
+                    pct = float(m.group(1))
+                    if int(pct) == last_pct:
+                        continue
+                    last_pct = int(pct)
+                    size_val = float(m.group(2))
+                    unit = m.group(3)
+                    eta = m.group(4) if m.lastindex >= 4 else ""
+                    bar_width = 25
+                    filled = int(bar_width * pct / 100)
+                    bar = "█" * filled + "░" * (bar_width - filled)
+                    eta_str = f" ETA {eta}" if eta else ""
+                    print(f"\r  {bar}  {pct:>5.1f}%  {size_val:.1f}{unit}{eta_str}    ", end="", file=sys.stderr, flush=True)
+                else:
+                    print(f"\r  {line.rstrip():<50}", file=sys.stderr, flush=True)
+            elif "ERROR:" in line or "WARNING:" in line:
+                last_error = line.strip()
+                print(f"  {line.rstrip()}", file=sys.stderr, flush=True)
 
         proc.wait()
         print(file=sys.stderr)
@@ -520,7 +523,10 @@ def download_video(url, title="", referer=None, output_dir=".", track_id=None):
                 _track_update(track_id, status="completed")
             print(f"  Done — {safe}", file=sys.stderr)
         else:
-            raise PlayerLaunchError("yt-dlp", f"exit code {proc.returncode}")
+            detail = last_error or f"exit code {proc.returncode}"
+            if track_id:
+                _track_update(track_id, status="error")
+            raise PlayerLaunchError("yt-dlp", detail)
 
     except KeyboardInterrupt:
         print(file=sys.stderr)

{cinnamon_cli-0.2.29 → cinnamon_cli-0.2.31}/cinnamon/scrapers/webstream.py

@@ -75,7 +75,7 @@ class WebStreamScraper(BaseScraper):
 
             if _time.time() < deadline:
                 try:
-                    result = vidlink_fn(tmdb_id)
+                    result = vidlink_fn(tmdb_id, quality)
                     if result:
                         label = quality.upper() if quality else "Auto"
                         return ScraperResult(
@@ -113,7 +113,7 @@ class WebStreamScraper(BaseScraper):
 
         if _time.time() < deadline:
             try:
-                result = vidlink_fn(tmdb_id, season, episode)
+                result = vidlink_fn(tmdb_id, season, episode, quality)
                 if result:
                     label = quality.upper() if quality else "Auto"
                     return ScraperResult(
@@ -194,7 +194,23 @@ def _try_vixsrc(tmdb_id, season, episode, quality="") -> Optional[str]:
     return match[1]
 
 
-def _try_vidlink(tmdb_id, season, episode) -> Optional[str]:
+def _vidlink_quality_url(data, quality=""):
+    """vidlink returns direct mp4 URLs per resolution under stream.qualities."""
+    qualities = data.get("stream", {}).get("qualities", {})
+    if not qualities:
+        raise ScraperNetworkError("vidlink", "No qualities in stream response")
+    if quality and quality not in ("best", "worst"):
+        target = quality.replace("p", "")
+        if target in qualities:
+            return qualities[target]["url"]
+    if quality == "worst":
+        res = min(qualities, key=lambda r: int(r))
+    else:
+        res = max(qualities, key=lambda r: int(r))
+    return qualities[res]["url"]
+
+
+def _try_vidlink(tmdb_id, season, episode, quality="") -> Optional[str]:
     session = requests.Session()
     session.headers.update({"User-Agent": UA})
 
@@ -222,11 +238,7 @@ def _try_vidlink(tmdb_id, season, episode) -> Optional[str]:
         data = stream_resp.json()
     except ValueError:
         raise ScraperNetworkError("vidlink", "Non-JSON response from stream API")
-    playlist = data.get("stream", {}).get("playlist")
-    if not playlist:
-        raise ScraperNetworkError("vidlink", "No playlist in stream response")
-
-    return playlist
+    return _vidlink_quality_url(data, quality)
 
 
 def _try_vixsrc_movie(tmdb_id, quality="") -> Optional[str]:
@@ -291,7 +303,7 @@ def _try_vixsrc_movie(tmdb_id, quality="") -> Optional[str]:
     return match[1]
 
 
-def _try_vidlink_movie(tmdb_id) -> Optional[str]:
+def _try_vidlink_movie(tmdb_id, quality="") -> Optional[str]:
     session = requests.Session()
     session.headers.update({"User-Agent": UA})
 
@@ -319,8 +331,4 @@ def _try_vidlink_movie(tmdb_id) -> Optional[str]:
         data = stream_resp.json()
     except ValueError:
         raise ScraperNetworkError("vidlink", "Non-JSON response from stream API")
-    playlist = data.get("stream", {}).get("playlist")
-    if not playlist:
-        raise ScraperNetworkError("vidlink", "No playlist in stream response")
-
-    return playlist
+    return _vidlink_quality_url(data, quality)

{cinnamon_cli-0.2.29 → cinnamon_cli-0.2.31/cinnamon_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.29
+Version: 0.2.31
 Summary: CLI to search TV shows, movies & anime via TMDB/AniList, scrape m3u8 links, and play in VLC/mpv
 Author: pizza-droid
 License: CC BY-NC 4.0

{cinnamon_cli-0.2.29 → cinnamon_cli-0.2.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cinnamon-cli"
-version = "0.2.29"
+version = "0.2.31"
 description = "CLI to search TV shows, movies & anime via TMDB/AniList, scrape m3u8 links, and play in VLC/mpv"
 license = { text = "CC BY-NC 4.0" }
 readme = "README.md"

cinnamon_cli-0.2.29/cinnamon/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.29"