cinnamon-cli 0.2.38__tar.gz → 0.2.40__tar.gz

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.38
+Version: 0.2.40
 Summary: Watch Movies, TV shows and anime from your terminal.
 Author: pizza-droid
 License: CC BY-NC 4.0
@@ -29,7 +29,7 @@ Provides-Extra: download
 Requires-Dist: yt-dlp>=2024.1.0; extra == "download"
 Dynamic: license-file
 
-# cinnamon
+# Cinnamon | Beta
 
 Watch TV shows, movies, and anime from your terminal. Search, pick a title, and it plays in mpv or VLC.
 
@@ -49,7 +49,7 @@ pip install cinnamon-cli
 cinnamon setup
 ```
 
-> The setup wizard asks for a TMDB API key ([Create a free account here](https://www.themoviedb.org/signup)), the api key is used for show and movie information. If you skip it, `search` & `watch` fall back to an **experimental** 2embed metadata proxy (no key needed) — it works but is less reliable.
+> The setup wizard asks for a TMDB API key ([Create a free account here](https://www.themoviedb.org/signup)), the api key is used for show and movie information. If you skip it, it will use an **experimental** 2embed search (no key needed), it works but is less reliable.
 
 
 
@@ -70,7 +70,7 @@ cinnamon search "Breaking Bad"
 cinnamon search "Inception"
 ```
 
-For Anime you can run (Works even if you dont have an api key):
+For Anime you can run:
 
 ```bash
 cinnamon anime "Chainsaw Man"
@@ -90,7 +90,7 @@ you can also run it like this:
 ```bash
 cinnamon Inception
 cinnamon Breaking bad
-cinnamon chainsaw man
+cinnamon chainsaw man # Not reccomended to search an anime like this
 ```
 
 ### Download episodes
@@ -122,9 +122,9 @@ cinnamon search "Breaking Bad" -d -e 1-5
 | `cinnamon history` | Show watch history |
 | `cinnamon history <query>` | Show episodes played for a show and continue from next |
 | `cinnamon history clear` | Clear all watch history |
-| `cinnamon history toggle [on|off]` | Enable or disable history tracking |
+| `cinnamon history toggle [on/off]` | Enable or disable history tracking |
 | `cinnamon config history show` | Show whether history tracking is enabled |
-| `cinnamon config history toggle [on|off]` | Enable or disable via config |
+| `cinnamon config history toggle [on/off]` | Enable or disable via config |
 | `cinnamon scrapers` | See available streaming sources |
 | `cinnamon install <name>` | Add an optional scraper (vidsrc, torrentio) |
 | `cinnamon update` | Check for and install the latest version |
@@ -184,9 +184,9 @@ cinnamon config set-api-key YOUR_KEY
 
 ## Notes
 
-**Experimental 2embed metadata proxy:** When no TMDB API key is configured, `search` and `watch` fall back to `api.2embed.cc` (no key needed). This works for most popular shows/movies but may be slower, less reliable, or return incomplete results. We reccomend getting a TMDB key for a more reliable experience
+Anime movies now work (both sub and dub). Use `--sub` or `--dub` to pick your translation, or just run the command and it will ask.
 
-This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines.
+This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines of code.
 feel free to give us feedback so we can improve this project and make it as good as possible.
 
 inspired by [ani-cli](https://github.com/pystardust/ani-cli)

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/README.md

@@ -1,4 +1,4 @@
-# cinnamon
+# Cinnamon | Beta
 
 Watch TV shows, movies, and anime from your terminal. Search, pick a title, and it plays in mpv or VLC.
 
@@ -18,7 +18,7 @@ pip install cinnamon-cli
 cinnamon setup
 ```
 
-> The setup wizard asks for a TMDB API key ([Create a free account here](https://www.themoviedb.org/signup)), the api key is used for show and movie information. If you skip it, `search` & `watch` fall back to an **experimental** 2embed metadata proxy (no key needed) — it works but is less reliable.
+> The setup wizard asks for a TMDB API key ([Create a free account here](https://www.themoviedb.org/signup)), the api key is used for show and movie information. If you skip it, it will use an **experimental** 2embed search (no key needed), it works but is less reliable.
 
 
 
@@ -39,7 +39,7 @@ cinnamon search "Breaking Bad"
 cinnamon search "Inception"
 ```
 
-For Anime you can run (Works even if you dont have an api key):
+For Anime you can run:
 
 ```bash
 cinnamon anime "Chainsaw Man"
@@ -59,7 +59,7 @@ you can also run it like this:
 ```bash
 cinnamon Inception
 cinnamon Breaking bad
-cinnamon chainsaw man
+cinnamon chainsaw man # Not reccomended to search an anime like this
 ```
 
 ### Download episodes
@@ -91,9 +91,9 @@ cinnamon search "Breaking Bad" -d -e 1-5
 | `cinnamon history` | Show watch history |
 | `cinnamon history <query>` | Show episodes played for a show and continue from next |
 | `cinnamon history clear` | Clear all watch history |
-| `cinnamon history toggle [on|off]` | Enable or disable history tracking |
+| `cinnamon history toggle [on/off]` | Enable or disable history tracking |
 | `cinnamon config history show` | Show whether history tracking is enabled |
-| `cinnamon config history toggle [on|off]` | Enable or disable via config |
+| `cinnamon config history toggle [on/off]` | Enable or disable via config |
 | `cinnamon scrapers` | See available streaming sources |
 | `cinnamon install <name>` | Add an optional scraper (vidsrc, torrentio) |
 | `cinnamon update` | Check for and install the latest version |
@@ -153,9 +153,9 @@ cinnamon config set-api-key YOUR_KEY
 
 ## Notes
 
-**Experimental 2embed metadata proxy:** When no TMDB API key is configured, `search` and `watch` fall back to `api.2embed.cc` (no key needed). This works for most popular shows/movies but may be slower, less reliable, or return incomplete results. We reccomend getting a TMDB key for a more reliable experience
+Anime movies now work (both sub and dub). Use `--sub` or `--dub` to pick your translation, or just run the command and it will ask.
 
-This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines.
+This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines of code.
 feel free to give us feedback so we can improve this project and make it as good as possible.
 
 inspired by [ani-cli](https://github.com/pystardust/ani-cli)

cinnamon_cli-0.2.40/cinnamon/__init__.py

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

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/cinnamon/anilist.py

@@ -1,3 +1,5 @@
+import time as _time
+
 import requests
 
 from .errors import CinnamonError
@@ -90,3 +92,72 @@ def find_sequel(anime_name):
         return None
     except (requests.RequestException, CinnamonError):
         return None
+
+
+_SCHEDULE_QUERY = """
+query ($page: Int, $perPage: Int, $airingAtGreater: Int, $airingAtLesser: Int) {
+  Page(page: $page, perPage: $perPage) {
+    airingSchedules(
+      airingAt_greater: $airingAtGreater
+      airingAt_lesser: $airingAtLesser
+      sort: TIME
+    ) {
+      id
+      airingAt
+      episode
+      media {
+        id
+        title { romaji english }
+        format
+        status
+        episodes
+        popularity
+        averageScore
+      }
+    }
+  }
+}
+"""
+
+
+def get_schedule(days=7):
+    now = int(_time.time())
+    end = now + (days * 86400)
+    try:
+        resp = requests.post(
+            API,
+            json={
+                "query": _SCHEDULE_QUERY,
+                "variables": {
+                    "page": 1,
+                    "perPage": 50,
+                    "airingAtGreater": now,
+                    "airingAtLesser": end,
+                },
+            },
+            timeout=15,
+            headers={"User-Agent": UA, "Content-Type": "application/json", "Accept": "application/json"},
+        )
+        resp.raise_for_status()
+        data = resp.json()
+        schedules = data.get("data", {}).get("Page", {}).get("airingSchedules", [])
+        results = []
+        for s in schedules:
+            media = s.get("media", {})
+            title = media.get("title", {}) or {}
+            results.append({
+                "airing_at": s.get("airingAt", 0),
+                "episode": s.get("episode"),
+                "title_romaji": title.get("romaji", "") or "",
+                "title_english": title.get("english", "") or "",
+                "format": media.get("format", ""),
+                "popularity": media.get("popularity", 0) or 0,
+                "score": media.get("averageScore", 0) or 0,
+            })
+        return results
+    except requests.ConnectionError:
+        raise CinnamonError("Could not reach AniList. Check your internet connection.")
+    except requests.Timeout:
+        raise CinnamonError("AniList request timed out.")
+    except requests.HTTPError as e:
+        raise CinnamonError(f"AniList returned an error (HTTP {e.response.status_code}).")

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/cinnamon/cli.py

@@ -459,8 +459,6 @@ def _play_with_menu(show, season_num, ep_start, ep_end, ep_name, scraper, player
             questionary.Choice(title="Previous episode", value="prev"),
             questionary.Choice(title="Replay", value="replay"),
         ]
-        if scraper == "anime":
-            choices.append(questionary.Choice(title="Next season \u2192", value="next_season"))
         choices += [
             questionary.Choice(title="Change quality", value="quality"),
             questionary.Choice(title="Quit", value="quit"),
@@ -480,29 +478,6 @@ def _play_with_menu(show, season_num, ep_start, ep_end, ep_name, scraper, player
             ep_name = f"S{season_num:02d}E{ep_num:02d}"
         elif choice == "replay":
             pass
-        elif choice == "next_season":
-            try:
-                from .anilist import find_sequel as _find_sequel
-                sequel = _find_sequel(show.get("name", ""))
-                if not sequel:
-                    _print_error("No next season found on AniList.")
-                    continue
-                from .scrapers.anime import _find_show as _aa_find, _allanime_episodes as _aa_eps
-                import requests as _req
-                _as = _req.Session()
-                _as.headers.update({"User-Agent": "Mozilla/5.0"})
-                _aid = _aa_find(_as, sequel["name"])
-                if not _aid:
-                    _print_error(f"No match for \"{sequel['name']}\" on allanime.")
-                    continue
-                _ed = _aa_eps(_as, _aid)
-                if not _ed:
-                    _print_error("No episode data from allanime.")
-                    continue
-                _run_anime_flow(sequel["name"], _ed, player=player, quality=quality, info_only=info_only, download=download)
-                return
-            except Exception as _e:
-                _print_error("Failed to load next season.", str(_e))
         elif choice == "quality":
             try:
                 quality = _select(
@@ -1650,12 +1625,36 @@ def anime(query, season, ep_str, download, player, quality, info_only, prefer_su
     if show.get("format") == "MOVIE":
         console.print(f"  [{theme['info']}]Anime movie — playing directly[/{theme['info']}]")
         show_dict = {"name": show_name, "id": 0}
-        proc = _resolve_and_play(show_dict, None, 1, show_name, "anime", player, quality, info_only, download)
+
+        if prefer_sub and prefer_dub:
+            _print_info("Both --sub and --dub given; ignoring and asking.")
+            prefer_sub = prefer_dub = False
+
+        from .scrapers.anime import _find_show, _allanime_episodes
+        import requests as _req
+        session = _req.Session()
+        session.headers.update({"User-Agent": "Mozilla/5.0"})
+        allanime_id = _find_show(session, show_name)
+        tt = "sub"
+        if allanime_id:
+            eps = _allanime_episodes(session, allanime_id)
+            tt_keys = [k for k in eps if eps[k]]
+            if prefer_sub and "sub" in tt_keys:
+                tt = "sub"
+            elif prefer_dub and "dub" in tt_keys:
+                tt = "dub"
+            elif "sub" in tt_keys and len(tt_keys) > 1:
+                try:
+                    tt = _select("Translation:", choices=[
+                        questionary.Choice(title=k, value=k) for k in tt_keys
+                    ], default="sub")
+                except Exception:
+                    tt = "sub"
+            elif tt_keys:
+                tt = tt_keys[0]
+
+        proc = _resolve_and_play(show_dict, None, 1, show_name, "anime", player, quality, info_only, download, translation=tt)
         if proc is None and not info_only and not download:
-            # allanime has no playable source for this movie (e.g. its obfuscated
-            # streamer link can't be decoded, or it only offers iframe embeds with
-            # no direct mp4). Fall back to the webstream scraper via the movie's
-            # TMDB id so the film still plays.
             tmdb_id = _anime_movie_tmdb_id(show_name, year=(show.get("startDate") or {}).get("year"))
             if tmdb_id:
                 _print_info(f"allanime has no direct stream — using [bold]webstream[/bold] for the movie.")
@@ -1938,6 +1937,156 @@ def update():
         _print_error("Update failed.", str(e))
 
 
+# ---------------------------------------------------------------------------
+# schedule
+# ---------------------------------------------------------------------------
+
+
+@cli.group(invoke_without_command=True)
+@click.pass_context
+def schedule(ctx):
+    """Show this week's trending TV shows and movies (requires TMDB key)."""
+    if ctx.invoked_subcommand is None:
+        _schedule_impl()
+
+
+@schedule.command()
+@click.option("--days", type=int, default=7, help="Days ahead (default 7)")
+@_handle_errors
+def anime(days):
+    """Show anime airing schedule from AniList (no API key needed)."""
+    from .anilist import get_schedule
+    import datetime
+
+    entries = get_schedule(days=days)
+    if not entries:
+        _print_info(f"No anime airing in the next {days} day(s).")
+        return
+
+    now = datetime.datetime.now()
+
+    def _day_key(entry):
+        dt = datetime.datetime.fromtimestamp(entry["airing_at"])
+        return dt.date()
+
+    def _day_label(d):
+        diff = (d - now.date()).days
+        if diff == 0:
+            return "Today"
+        if diff == 1:
+            return "Tomorrow"
+        return d.strftime("%a %b %d")
+
+    by_day = {}
+    for e in entries:
+        d = _day_key(e)
+        by_day.setdefault(d, []).append(e)
+
+    for day in by_day:
+        by_day[day].sort(key=lambda x: (-(x.get("score") or 0), -(x.get("popularity") or 0)))
+
+    sorted_days = list(reversed(sorted(by_day.keys())))
+
+    theme = get_theme()
+    heading = f"[bold {theme['accent']}]Anime Schedule — next {days} day{'s' if days != 1 else ''}[/bold {theme['accent']}]"
+    console.print(Panel(heading, border_style=theme["border"]))
+
+    for i, day in enumerate(sorted_days):
+        entries = by_day[day]
+
+        def _est_delay(pop):
+            if pop >= 50000:
+                return 45
+            if pop >= 10000:
+                return 90
+            if pop >= 2000:
+                return 180
+            return 360
+
+        day_table = Table(border_style="dim", show_header=False, box=None, padding=(0, 1, 0, 0))
+        day_table.add_column("Time", no_wrap=True)
+        day_table.add_column("Title", no_wrap=False)
+        day_table.add_column("Ep", style="yellow", width=6, no_wrap=True)
+
+        for e in entries:
+            dt = datetime.datetime.fromtimestamp(e["airing_at"])
+            time_label = dt.strftime("%I:%M %p")
+            title = (e.get("title_english") or e.get("title_romaji") or "?")
+            if len(title) > 55:
+                title = title[:52] + "..."
+            ep = e.get("episode")
+            fmt = e.get("format", "")
+            ep_label = f"E{ep}" if ep and fmt != "MOVIE" else "—"
+            ready_dt = dt + datetime.timedelta(minutes=_est_delay(e.get("popularity", 0)))
+            time_label = f"[cyan]{time_label}[/] ~[dim]{ready_dt.strftime('%I:%M %p')}[/]"
+            day_table.add_row(time_label, title, ep_label)
+
+        day_panel = Panel(
+            day_table,
+            title=f"[bold {theme['accent']}]{_day_label(day)}[/bold {theme['accent']}]",
+            border_style=theme["border"],
+            padding=(0, 1),
+        )
+        console.print(day_panel)
+        if i < len(sorted_days) - 1:
+            console.print()
+
+
+def _schedule_impl():
+    try:
+        tmdb = _get_tmdb()
+    except MissingAPIKey:
+        _print_info("A TMDB API key is required for the 'schedule' command.")
+        _print_info("  Run: cinnamon config set-api-key <key>")
+        _print_info("  Or use: cinnamon schedule anime (no key needed)")
+        return
+
+    if isinstance(tmdb, EmbedClient):
+        _print_info("A TMDB API key is required for the 'schedule' command.")
+        _print_info("  Run: cinnamon config set-api-key <key>")
+        _print_info("  Or use: cinnamon schedule anime (no key needed)")
+        return
+
+    theme = get_theme()
+    console.print(Panel(
+        f"[bold {theme['accent']}]Trending This Week[/bold {theme['accent']}]",
+        border_style=theme["border"],
+    ))
+
+    table = Table(border_style="dim")
+    table.add_column("Title")
+    table.add_column("Date", style="cyan")
+    table.add_column("Type", style="green")
+    table.add_column("Rating", style="yellow")
+
+    tv_data = tmdb.get_trending("tv", "week")
+    movie_data = tmdb.get_trending("movie", "week")
+
+    rows = []
+    for item in tv_data.get("results", []):
+        rows.append({
+            "title": item.get("name", "?"),
+            "date": item.get("first_air_date", ""),
+            "type": "TV",
+            "rating": item.get("vote_average", 0),
+        })
+    for item in movie_data.get("results", []):
+        rows.append({
+            "title": item.get("title", "?"),
+            "date": item.get("release_date", ""),
+            "type": "Movie",
+            "rating": item.get("vote_average", 0),
+        })
+
+    rows.sort(key=lambda r: r["rating"], reverse=True)
+
+    for r in rows:
+        rating_str = f"{r['rating']:.1f}" if r["rating"] else "—"
+        table.add_row(r["title"], r["date"][:10], r["type"], rating_str)
+
+    console.print(table)
+
+
 # ---------------------------------------------------------------------------
 # history
 # ---------------------------------------------------------------------------

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/cinnamon/scrapers/anime.py

@@ -3,6 +3,7 @@ import hashlib
 import json
 import re
 import socket
+import subprocess
 import time as _time
 import contextlib
 from typing import Optional, Tuple
@@ -40,7 +41,7 @@ def _force_ipv4():
         socket.getaddrinfo = orig
 
 
-def _new_session(ua=UA, origin="https://youtu-chan.com"):
+def _new_session(ua=UA, origin="https://mkissa.to"):
     """Build a requests.Session with retries and IPv4-biased DNS."""
     s = requests.Session()
     s.headers.update({"User-Agent": ua, "Origin": origin})
@@ -78,14 +79,16 @@ _BROWSER_UA = (
     "(KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36"
 )
 # Last known good values, only used when the runtime fetch fails.
-# Rotated 2026-07; the runtime fetch (_aa_fetch) overrides these with live
-# values from the site so the token stays valid between code updates.
-_FALLBACK_EPOCH = 4130
-_FALLBACK_MASK = "4e600edee179ef01e61d9e322afb6418efb0ea4a33e798adcb62edc5e885423b"
-_FALLBACK_PART_B = "eu1Ih9XG2JYVqkp8XDkLzBEOIOEUQwCILJLs+ifdpeA="
-_FALLBACK_QUERY_HASH = "d405d0edd690624b66baba3068e0edc3ac90f1597d898a1ec8db4e5c43c00fec"
+# Updated 2026-07-24 (epoch 6885); the runtime fetch (_aa_fetch) overrides
+# these with live values from the site so the token stays valid between
+# code updates.
+_FALLBACK_EPOCH = 6885
+_FALLBACK_MASK = "70bb5e6260e19a806b3609dc0b6eb718899b09edbd0c23703a5de00e544de128"
+_FALLBACK_PART_B = "j6t9AsXnwTdE9yEr5MuzNTbWvG9YyaQkPd+FnD47XvA="
+_FALLBACK_QUERY_HASH = "1d724f8b7e14b624bf96bd43b88dbb68253e503c40d6d0c6b5a73c9a6d149f2b"
 # Static legacy key AllAnime also signs tobeparsed with, depending on rotation.
 _RESP_STATIC_KEY = hashlib.sha256(b"Xot36i3lK3:v1").digest()
+_BUILD_ID = "64"
 
 _crypto_cache = None  # (expires_ms, epoch, key, mask, query_hash)
 
@@ -130,7 +133,8 @@ def _aa_fetch():
     """Fetch (expires_ms, epoch, key, mask, query_hash) from the live site."""
     try:
         s = _new_session(ua=_BROWSER_UA, origin="https://mkissa.to")
-        html = s.get(_MKISSA_URL, timeout=10).text
+        with _force_ipv4():
+            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"])
         expires = max(aa.get("switchAt", 0) + aa.get("graceMs", 0),
@@ -140,17 +144,31 @@ def _aa_fetch():
 
         app = re.search(r"_app/immutable/(entry/app\.[^\"']+\.js)", html)
         if app:
-            app_js = s.get(_CDN_IMMUTABLE + app.group(1), timeout=10).text
+            with _force_ipv4():
+                app_js = s.get(_CDN_IMMUTABLE + app.group(1), timeout=10).text
             for chunk in re.findall(
                 r"chunks/[A-Za-z0-9_\-]+\.js", app_js
             ):
-                js = s.get(_CDN_IMMUTABLE + chunk, timeout=10).text
+                with _force_ipv4():
+                    js = s.get(_CDN_IMMUTABLE + chunk, timeout=10).text
                 if "__aaCrypto" not in js:
                     continue
                 masks = re.findall(r"[0-9a-f]{64}", js)
                 if len(masks) == 1:
                     mask = masks[0]
-                    qh = _aa_source_query_hash(js) or _FALLBACK_QUERY_HASH
+                    # Compute the query hash from the resolved inline query
+                    # string (which handles whatever template shape the JS
+                    # chunk currently uses), rather than from regex-extracted
+                    # template placeholders that may break when the chunk is
+                    # updated.  Fall back to the hardcoded hash if resolution
+                    # fails (the server will reject the request with
+                    # AA_CRYPTO_MISSING but that is recoverable).
+                    try:
+                        import hashlib
+                        qstr = _aa_source_query_string()
+                        qh = hashlib.sha256(qstr.encode()).hexdigest()
+                    except Exception:
+                        qh = _FALLBACK_QUERY_HASH
                 break
 
         # If the mask could not be scraped, fall back to the last known good
@@ -178,8 +196,8 @@ def _aa_current() -> Tuple[int, bytes, str]:
 def _aa_build_token() -> Tuple[str, str, bytes]:
     epoch, key, query_hash = _aa_current()
     ts = int(_time.time() * 1000) // 300000 * 300000
-    payload = {"v": 1, "ts": ts, "epoch": epoch, "qh": query_hash}
-    iv = hashlib.sha256(f"{epoch}:{query_hash}:{ts}".encode()).digest()[:12]
+    payload = {"v": 1, "ts": ts, "epoch": epoch, "buildId": _BUILD_ID, "qh": query_hash}
+    iv = hashlib.sha256(f"{epoch}:{_BUILD_ID}:{query_hash}:{ts}".encode()).digest()[:12]
     from Crypto.Cipher import AES
     cipher = AES.new(key, AES.MODE_GCM, nonce=iv)
     ciphertext, tag = cipher.encrypt_and_digest(
@@ -272,15 +290,18 @@ def _aa_source_query_string():
         return _SOURCE_QUERY_CACHE[1]
     s = _new_session(ua=_BROWSER_UA, origin="https://mkissa.to")
     try:
-        html = s.get(_MKISSA_URL, timeout=10).text
+        with _force_ipv4():
+            html = s.get(_MKISSA_URL, timeout=10).text
         app = re.search(r"_app/immutable/(entry/app\.[^\"']+\.js)", html)
         if not app:
             raise ValueError("no app entry")
-        app_js = s.get(_CDN_IMMUTABLE + app.group(1), timeout=10).text
+        with _force_ipv4():
+            app_js = s.get(_CDN_IMMUTABLE + app.group(1), timeout=10).text
         chunk_urls = re.findall(r"chunks/[A-Za-z0-9_\-]+\.js", app_js)
         js = ""
         for cu in chunk_urls:
-            c = s.get(_CDN_IMMUTABLE + cu, timeout=10).text
+            with _force_ipv4():
+                c = s.get(_CDN_IMMUTABLE + cu, timeout=10).text
             if "sourceUrls" in c:
                 js = c
                 break
@@ -331,14 +352,17 @@ def _aa_source_query_string():
         )
 
 
-def _gql_src_inline(session, variables, aa_req):
+def _gql_src_inline(session, variables, aa_req, query_hash=None):
     global _LAST_REQUEST
     elapsed = _time.time() - _LAST_REQUEST
     if elapsed < 3.5:
         _time.sleep(3.5 - elapsed)
     query = _aa_source_query_string()
+    if query_hash is None:
+        query_hash = hashlib.sha256(query.encode()).hexdigest()
+    extensions = {"persistedQuery": {"version": 1, "sha256Hash": query_hash}, "aaReq": aa_req}
     body = json.dumps(
-        {"query": query, "variables": variables, "extensions": {"aaReq": aa_req}},
+        {"query": query, "variables": variables, "extensions": extensions},
         ensure_ascii=False, separators=(",", ":"),
     )
     try:
@@ -360,9 +384,9 @@ def _allanime_episodes(session, show_id):
     return data.get("data", {}).get("show", {}).get("availableEpisodesDetail", {})
 
 def _allanime_sources(session, show_id, ep_str, tt="sub"):
-    token, key = _aa_build_token()[1], _aa_build_token()[2]
+    query_hash, token, key = _aa_build_token()
     variables = {"showId": show_id, "translationType": tt, "episodeString": ep_str}
-    data = _gql_src_inline(session, variables, token)
+    data = _gql_src_inline(session, variables, token, query_hash=query_hash)
     if isinstance(data, dict):
         tp = data.get("data", {}).get("tobeparsed", "")
         if not tp and data.get("errors"):
@@ -497,7 +521,7 @@ def _clock_stream(session, clock_url):
             if isinstance(links, list) and links:
                 first = links[0]
                 if isinstance(first, dict):
-                    return first.get("url") or first.get("file")
+                    return first.get("url") or first.get("file") or first.get("link")
                 if isinstance(first, str):
                     return first
     # Some clocks return the bare URL as text.
@@ -588,7 +612,37 @@ class AnimeScraper(BaseScraper):
             except Exception:
                 pass
 
-        # 3) Any other directly-playable http(s) URL (already-resolved media:
+                # 3) yt-dlp fallback for embed pages (ok.ru, …).
+        for src in sources:
+            if _time.time() >= deadline:
+                break
+            url = src.get("sourceUrl", "")
+            if not url or not url.startswith("http"):
+                continue
+            low = url.split("?")[0].lower()
+            if low.endswith((".m3u8", ".mp4", ".m4v", ".mkv", ".mov", ".webm")) or ".m3u8" in url:
+                continue
+            try:
+                proc = subprocess.run(
+                    ["yt-dlp", "-g", "--no-warnings", url],
+                    capture_output=True, text=True, timeout=10,
+                )
+                out = proc.stdout.strip()
+                if out:
+                    first = out.split("\n")[0]
+                    stripped_src = url.removeprefix("https://www.").removeprefix("http://www.").removeprefix("https://").removeprefix("http://")
+                    stripped_dst = first.removeprefix("https://www.").removeprefix("http://www.").removeprefix("https://").removeprefix("http://")
+                    if stripped_src != stripped_dst:
+                        return ScraperResult(
+                            title=f"{show_name} E{episode:02d} ({label}) [ytdlp]",
+                            m3u8_url=first,
+                            referer="https://allanime.day/",
+                            user_agent=UA,
+                        )
+            except Exception:
+                pass
+
+        # 4) Any other directly-playable http(s) URL (already-resolved media:
         #    .m3u8 / .mp4 / .m4v / .mkv). Embed pages are NOT playable, so we
         #    only accept URLs that end in a known media extension (or carry an
         #    HLS query). Bare provider pages (.com/e/...) are skipped so the

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/cinnamon/tmdb.py

@@ -81,3 +81,6 @@ class TMDBClient:
 
     def search_movie(self, query):
         return self._request("/search/movie", {"query": query})
+
+    def get_trending(self, media_type="all", time_window="week"):
+        return self._request(f"/trending/{media_type}/{time_window}")

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/cinnamon_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.38
+Version: 0.2.40
 Summary: Watch Movies, TV shows and anime from your terminal.
 Author: pizza-droid
 License: CC BY-NC 4.0
@@ -29,7 +29,7 @@ Provides-Extra: download
 Requires-Dist: yt-dlp>=2024.1.0; extra == "download"
 Dynamic: license-file
 
-# cinnamon
+# Cinnamon | Beta
 
 Watch TV shows, movies, and anime from your terminal. Search, pick a title, and it plays in mpv or VLC.
 
@@ -49,7 +49,7 @@ pip install cinnamon-cli
 cinnamon setup
 ```
 
-> The setup wizard asks for a TMDB API key ([Create a free account here](https://www.themoviedb.org/signup)), the api key is used for show and movie information. If you skip it, `search` & `watch` fall back to an **experimental** 2embed metadata proxy (no key needed) — it works but is less reliable.
+> The setup wizard asks for a TMDB API key ([Create a free account here](https://www.themoviedb.org/signup)), the api key is used for show and movie information. If you skip it, it will use an **experimental** 2embed search (no key needed), it works but is less reliable.
 
 
 
@@ -70,7 +70,7 @@ cinnamon search "Breaking Bad"
 cinnamon search "Inception"
 ```
 
-For Anime you can run (Works even if you dont have an api key):
+For Anime you can run:
 
 ```bash
 cinnamon anime "Chainsaw Man"
@@ -90,7 +90,7 @@ you can also run it like this:
 ```bash
 cinnamon Inception
 cinnamon Breaking bad
-cinnamon chainsaw man
+cinnamon chainsaw man # Not reccomended to search an anime like this
 ```
 
 ### Download episodes
@@ -122,9 +122,9 @@ cinnamon search "Breaking Bad" -d -e 1-5
 | `cinnamon history` | Show watch history |
 | `cinnamon history <query>` | Show episodes played for a show and continue from next |
 | `cinnamon history clear` | Clear all watch history |
-| `cinnamon history toggle [on|off]` | Enable or disable history tracking |
+| `cinnamon history toggle [on/off]` | Enable or disable history tracking |
 | `cinnamon config history show` | Show whether history tracking is enabled |
-| `cinnamon config history toggle [on|off]` | Enable or disable via config |
+| `cinnamon config history toggle [on/off]` | Enable or disable via config |
 | `cinnamon scrapers` | See available streaming sources |
 | `cinnamon install <name>` | Add an optional scraper (vidsrc, torrentio) |
 | `cinnamon update` | Check for and install the latest version |
@@ -184,9 +184,9 @@ cinnamon config set-api-key YOUR_KEY
 
 ## Notes
 
-**Experimental 2embed metadata proxy:** When no TMDB API key is configured, `search` and `watch` fall back to `api.2embed.cc` (no key needed). This works for most popular shows/movies but may be slower, less reliable, or return incomplete results. We reccomend getting a TMDB key for a more reliable experience
+Anime movies now work (both sub and dub). Use `--sub` or `--dub` to pick your translation, or just run the command and it will ask.
 
-This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines.
+This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines of code.
 feel free to give us feedback so we can improve this project and make it as good as possible.
 
 inspired by [ani-cli](https://github.com/pystardust/ani-cli)

{cinnamon_cli-0.2.38 → cinnamon_cli-0.2.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cinnamon-cli"
-version = "0.2.38"
+version = "0.2.40"
 description = "Watch Movies, TV shows and anime from your terminal."
 license = { text = "CC BY-NC 4.0" }
 readme = "README.md"

cinnamon_cli-0.2.38/cinnamon/__init__.py

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