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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.27
+Version: 0.2.29
 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.27 → cinnamon_cli-0.2.29}/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.29/cinnamon/__init__.py

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

{cinnamon_cli-0.2.27 → cinnamon_cli-0.2.29}/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.27 → cinnamon_cli-0.2.29}/cinnamon/player.py

@@ -470,7 +470,9 @@ def download_video(url, title="", referer=None, output_dir=".", track_id=None):
     safe = "".join(c if c.isalnum() or c in " .-_()" else "_" for c in title) or "video"
     outtmpl = os.path.join(output_dir, f"{safe}.%(ext)s")
 
-    cmd = [exe, "--no-mtime", "--no-warnings", "-o", outtmpl]
+    cmd = [
+        exe, "--no-mtime", "--no-warnings", "-o", outtmpl,
+    ]
     if referer:
         cmd += ["--referer", referer]
     cmd.append(url)

{cinnamon_cli-0.2.27 → cinnamon_cli-0.2.29}/cinnamon/scrapers/anime.py

@@ -2,15 +2,60 @@ import base64
 import hashlib
 import json
 import re
+import socket
 import time as _time
+import contextlib
 from typing import Optional, Tuple
 
 import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 
 from ..errors import ScraperNetworkError, ScraperNoStreamError, ScraperParseError
 from ..player import DEFAULT_UA as UA
 from .base import BaseScraper, ScraperResult
 
+
+@contextlib.contextmanager
+def _force_ipv4():
+    """Temporarily make getaddrinfo prefer IPv4.
+
+    allanime's API is served behind Cloudflare which publishes AAAA (IPv6)
+    records first. On hosts without working IPv6, Python's getaddrinfo can
+    intermittently fail with 'Errno 11002 getaddrinfo failed', so we bias
+    resolution toward IPv4 for the duration of a request.
+    """
+    orig = socket.getaddrinfo
+
+    def _prefer_v4(host, port, family=socket.AF_UNSPEC, type=0, proto=0, flags=0):
+        try:
+            return orig(host, port, socket.AF_INET, type, proto, flags)
+        except socket.gaierror:
+            return orig(host, port, family, type, proto, flags)
+
+    socket.getaddrinfo = _prefer_v4
+    try:
+        yield
+    finally:
+        socket.getaddrinfo = orig
+
+
+def _new_session(ua=UA, origin="https://youtu-chan.com"):
+    """Build a requests.Session with retries and IPv4-biased DNS."""
+    s = requests.Session()
+    s.headers.update({"User-Agent": ua, "Origin": origin})
+    retry = Retry(
+        total=3,
+        backoff_factor=1.0,
+        status_forcelist=[500, 502, 503, 504],
+        allowed_methods=frozenset(["GET", "POST"]),
+        raise_on_status=False,
+    )
+    adapter = HTTPAdapter(max_retries=retry, pool_connections=4, pool_maxsize=4)
+    s.mount("https://", adapter)
+    s.mount("http://", adapter)
+    return s
+
 TIMEOUT = 15
 API = "https://api.allanime.day/api"
 
@@ -84,8 +129,7 @@ def _aa_source_query_hash(chunk_js: str) -> Optional[str]:
 def _aa_fetch():
     """Fetch (expires_ms, epoch, key, mask, query_hash) from the live site."""
     try:
-        s = requests.Session()
-        s.headers.update({"User-Agent": _BROWSER_UA})
+        s = _new_session(ua=_BROWSER_UA, origin="https://mkissa.to")
         html = s.get(_MKISSA_URL, timeout=10).text
         aa = json.loads(re.search(r"window\.__aaCrypto\s*=\s*(\{.*?\})", html).group(1))
         part_b, epoch = aa["partB"], int(aa["epoch"])
@@ -179,7 +223,11 @@ def _gql(session, query, variables):
     if elapsed < 3.5:
         _time.sleep(3.5 - elapsed)
     body = json.dumps({"variables": json.dumps(variables), "query": query}, ensure_ascii=False, separators=(",", ":"))
-    resp = session.post(API, data=body, timeout=TIMEOUT, headers={"Content-Type": "application/json"})
+    try:
+        with _force_ipv4():
+            resp = session.post(API, data=body, timeout=TIMEOUT, headers={"Content-Type": "application/json"})
+    except (requests.ConnectionError, requests.Timeout) as e:
+        raise ScraperNetworkError("allanime", f"Could not reach allanime API (check your connection / DNS): {e}")
     _LAST_REQUEST = _time.time()
     if resp.status_code != 200:
         raise ScraperNetworkError("allanime", f"GraphQL returned {resp.status_code}")
@@ -199,7 +247,11 @@ def _gql_src(session, variables, query_hash=None, aa_req=None):
         {"extensions": extensions, "variables": json.dumps(variables)},
         ensure_ascii=False, separators=(",", ":"),
     )
-    resp = session.post(API, data=body, timeout=TIMEOUT, headers={"Content-Type": "application/json"})
+    try:
+        with _force_ipv4():
+            resp = session.post(API, data=body, timeout=TIMEOUT, headers={"Content-Type": "application/json"})
+    except (requests.ConnectionError, requests.Timeout) as e:
+        raise ScraperNetworkError("allanime", f"Could not reach allanime API (check your connection / DNS): {e}")
     _LAST_REQUEST = _time.time()
     if resp.status_code != 200:
         raise ScraperNetworkError("allanime", f"Source GQL returned {resp.status_code}")
@@ -274,8 +326,7 @@ class AnimeScraper(BaseScraper):
             raise ScraperParseError(self.name, "Missing show name in episode_info")
 
         deadline = _time.time() + 30
-        session = requests.Session()
-        session.headers.update({"User-Agent": UA, "Origin": "https://youtu-chan.com"})
+        session = _new_session()
 
         if _time.time() >= deadline:
             raise ScraperNoStreamError(self.name, "Timeout searching allanime")
@@ -301,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.27 → cinnamon_cli-0.2.29}/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)
                     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)
                 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,

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

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

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

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