cinnamon-cli 0.2.30__tar.gz → 0.2.32__tar.gz

{cinnamon_cli-0.2.30/cinnamon_cli.egg-info → cinnamon_cli-0.2.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.30
+Version: 0.2.32
 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.32/cinnamon/__init__.py

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

{cinnamon_cli-0.2.30 → cinnamon_cli-0.2.32}/cinnamon/player.py

@@ -472,6 +472,10 @@ def download_video(url, title="", referer=None, output_dir=".", track_id=None):
 
     cmd = [
         exe, "--no-mtime", "--no-warnings", "-o", outtmpl,
+        "--retries", "10",
+        "--fragment-retries", "10",
+        "--retry-sleep", "2",
+        "--socket-timeout", "60",
     ]
     if referer:
         cmd += ["--referer", referer]
@@ -489,28 +493,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 +527,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.30 → cinnamon_cli-0.2.32}/cinnamon/scrapers/webstream.py

@@ -42,9 +42,9 @@ class WebStreamScraper(BaseScraper):
         season = episode_info.get("season", 1)
         episode = episode_info.get("episode", 1)
         quality = episode_info.get("quality", "")
-        # vidlink uses a different CDN that is not throttled like vixsrc's
-        # segment edge, so prefer it when downloading to avoid 503 stalls.
-        prefer_vidlink = bool(episode_info.get("download"))
+        # vixsrc first (sequential HLS that yt-dlp handles reliably); vidlink is the
+        # fallback. vidlink's .mp4 CDN (bcdn/stormvv) rate-limits aggressively (HTTP
+        # 429), so it is not preferred for downloads.
 
         if not tmdb_id:
             raise ScraperParseError(self.name, "Missing tmdb_id/movie_id/tv_id in episode_info")
@@ -52,16 +52,10 @@ class WebStreamScraper(BaseScraper):
         deadline = _time.time() + 30
 
         if media_type == "movie":
-            if prefer_vidlink:
-                vixsrc_fn, vidlink_fn = _try_vidlink_movie, _try_vixsrc_movie
-                vixsrc_ref = f"https://vixsrc.to/embed/movie/{tmdb_id}"
-            else:
-                vixsrc_fn, vidlink_fn = _try_vixsrc_movie, _try_vidlink_movie
-                vixsrc_ref = f"https://vixsrc.to/embed/movie/{tmdb_id}"
-
+            vixsrc_ref = f"https://vixsrc.to/embed/movie/{tmdb_id}"
             if _time.time() < deadline:
                 try:
-                    result = vixsrc_fn(tmdb_id, quality)
+                    result = _try_vixsrc_movie(tmdb_id, quality)
                     if result:
                         label = quality.upper() if quality else "Auto"
                         return ScraperResult(
@@ -75,7 +69,7 @@ class WebStreamScraper(BaseScraper):
 
             if _time.time() < deadline:
                 try:
-                    result = vidlink_fn(tmdb_id, quality)
+                    result = _try_vidlink_movie(tmdb_id, quality)
                     if result:
                         label = quality.upper() if quality else "Auto"
                         return ScraperResult(
@@ -90,16 +84,10 @@ class WebStreamScraper(BaseScraper):
             raise ScraperNoStreamError(self.name, f"No HTTP stream found for {show}")
 
         # TV
-        if prefer_vidlink:
-            vixsrc_fn, vidlink_fn = _try_vidlink, _try_vixsrc
-            vixsrc_ref = f"https://vixsrc.to/embed/tv/{tmdb_id}/{season}/{episode}"
-        else:
-            vixsrc_fn, vidlink_fn = _try_vixsrc, _try_vidlink
-            vixsrc_ref = f"https://vixsrc.to/embed/tv/{tmdb_id}/{season}/{episode}"
-
+        vixsrc_ref = f"https://vixsrc.to/embed/tv/{tmdb_id}/{season}/{episode}"
         if _time.time() < deadline:
             try:
-                result = vixsrc_fn(tmdb_id, season, episode, quality)
+                result = _try_vixsrc(tmdb_id, season, episode, quality)
                 if result:
                     label = quality.upper() if quality else "Auto"
                     return ScraperResult(
@@ -113,7 +101,7 @@ class WebStreamScraper(BaseScraper):
 
         if _time.time() < deadline:
             try:
-                result = vidlink_fn(tmdb_id, season, episode, quality)
+                result = _try_vidlink(tmdb_id, season, episode, quality)
                 if result:
                     label = quality.upper() if quality else "Auto"
                     return ScraperResult(

{cinnamon_cli-0.2.30 → cinnamon_cli-0.2.32/cinnamon_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.30
+Version: 0.2.32
 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.30 → cinnamon_cli-0.2.32}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cinnamon-cli"
-version = "0.2.30"
+version = "0.2.32"
 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.30/cinnamon/__init__.py

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