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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.28
+Version: 0.2.30
 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
@@ -78,8 +78,8 @@ By default you'll be asked whether to watch sub or dub. Skip the prompt with
 `-sub` / `-dub`:
 
 ```bash
-cinnamon anime "Chainsaw Man" --dub
-cinnamon anime "Frieren" --sub
+cinnamon anime "Chainsaw Man" --sub
+cinnamon anime "Frieren" --dub
 ```
 
 

{cinnamon_cli-0.2.28 → cinnamon_cli-0.2.30}/README.md

@@ -49,8 +49,8 @@ By default you'll be asked whether to watch sub or dub. Skip the prompt with
 `-sub` / `-dub`:
 
 ```bash
-cinnamon anime "Chainsaw Man" --dub
-cinnamon anime "Frieren" --sub
+cinnamon anime "Chainsaw Man" --sub
+cinnamon anime "Frieren" --dub
 ```
 
 

cinnamon_cli-0.2.30/cinnamon/__init__.py

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

{cinnamon_cli-0.2.28 → cinnamon_cli-0.2.30}/cinnamon/cli.py

@@ -531,6 +531,8 @@ def _resolve_and_play(show, season_num, ep_num, ep_name, scraper, player, qualit
                         info["quality"] = quality
                     if translation:
                         info["translation"] = translation
+                    if download:
+                        info["download"] = True
                     future = pool.submit(attempt.resolve, info)
                     result = future.result(timeout=RESOLVE_TIMEOUT)
             if result:

{cinnamon_cli-0.2.28 → cinnamon_cli-0.2.30}/cinnamon/scrapers/anime.py

@@ -352,7 +352,7 @@ class AnimeScraper(BaseScraper):
             try:
                 direct = _extract_mp4upload(session, url)
                 if direct:
-                    label = quality.upper() if quality else "Mp4upload"
+                    label = "Dub" if translation == "dub" else "Sub"
                     return ScraperResult(
                         title=f"{show_name} E{episode:02d} ({label})",
                         m3u8_url=direct,

{cinnamon_cli-0.2.28 → cinnamon_cli-0.2.30}/cinnamon/scrapers/webstream.py

@@ -42,6 +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"))
 
         if not tmdb_id:
             raise ScraperParseError(self.name, "Missing tmdb_id/movie_id/tv_id in episode_info")
@@ -49,28 +52,34 @@ class WebStreamScraper(BaseScraper):
         deadline = _time.time() + 30
 
         if media_type == "movie":
-            # Try vixsrc.to first
+            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}"
+
             if _time.time() < deadline:
                 try:
-                    result = _try_vixsrc_movie(tmdb_id, quality)
+                    result = vixsrc_fn(tmdb_id, quality)
                     if result:
-                        label = quality.upper() if quality else "vixsrc"
+                        label = quality.upper() if quality else "Auto"
                         return ScraperResult(
                             title=f"{show} ({label})",
                             m3u8_url=result,
-                            referer=f"https://vixsrc.to/embed/movie/{tmdb_id}",
+                            referer=vixsrc_ref,
                             user_agent=UA,
                         )
                 except ScraperNetworkError:
                     pass
 
-            # Try vidlink.pro as fallback
             if _time.time() < deadline:
                 try:
-                    result = _try_vidlink_movie(tmdb_id)
+                    result = vidlink_fn(tmdb_id, quality)
                     if result:
+                        label = quality.upper() if quality else "Auto"
                         return ScraperResult(
-                            title=f"{show} (vidlink)",
+                            title=f"{show} ({label})",
                             m3u8_url=result,
                             referer="https://vidlink.pro/",
                             user_agent=UA,
@@ -81,15 +90,22 @@ 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}"
+
         if _time.time() < deadline:
             try:
-                result = _try_vixsrc(tmdb_id, season, episode, quality)
+                result = vixsrc_fn(tmdb_id, season, episode, quality)
                 if result:
-                    label = quality.upper() if quality else "vixsrc"
+                    label = quality.upper() if quality else "Auto"
                     return ScraperResult(
                         title=f"{show} S{season:02d}E{episode:02d} ({label})",
                         m3u8_url=result,
-                        referer=f"https://vixsrc.to/embed/tv/{tmdb_id}/{season}/{episode}",
+                        referer=vixsrc_ref,
                         user_agent=UA,
                     )
             except ScraperNetworkError:
@@ -97,10 +113,11 @@ class WebStreamScraper(BaseScraper):
 
         if _time.time() < deadline:
             try:
-                result = _try_vidlink(tmdb_id, season, episode)
+                result = vidlink_fn(tmdb_id, season, episode, quality)
                 if result:
+                    label = quality.upper() if quality else "Auto"
                     return ScraperResult(
-                        title=f"{show} S{season:02d}E{episode:02d} (vidlink)",
+                        title=f"{show} S{season:02d}E{episode:02d} ({label})",
                         m3u8_url=result,
                         referer="https://vidlink.pro/",
                         user_agent=UA,
@@ -177,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})
 
@@ -205,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]:
@@ -274,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})
 
@@ -302,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.28 → cinnamon_cli-0.2.30/cinnamon_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.28
+Version: 0.2.30
 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
@@ -78,8 +78,8 @@ By default you'll be asked whether to watch sub or dub. Skip the prompt with
 `-sub` / `-dub`:
 
 ```bash
-cinnamon anime "Chainsaw Man" --dub
-cinnamon anime "Frieren" --sub
+cinnamon anime "Chainsaw Man" --sub
+cinnamon anime "Frieren" --dub
 ```
 
 

{cinnamon_cli-0.2.28 → cinnamon_cli-0.2.30}/pyproject.toml

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

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