cinnamon-cli 0.2.33__tar.gz → 0.2.37__tar.gz

{cinnamon_cli-0.2.33/cinnamon_cli.egg-info → cinnamon_cli-0.2.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinnamon-cli
-Version: 0.2.33
+Version: 0.2.37
 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
@@ -47,7 +47,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.
+> 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.
 
 
 
@@ -149,6 +149,7 @@ cinnamon search "Breaking Bad" -d -e 1-5
 | `webstream` | TV shows & movies from vixsrc.to and vidlink.pro (HLS) |
 | `anime` | Anime from allanime.day via mp4upload |
 
+
 **Optional (install with `cinnamon install <name>`):**
 
 | Name | Needs |
@@ -177,6 +178,8 @@ 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
+
 This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines.
 feel free to give us feedback so we can improve this project and make it as good as possible.
 

{cinnamon_cli-0.2.33 → cinnamon_cli-0.2.37}/README.md

@@ -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.
+> 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.
 
 
 
@@ -120,6 +120,7 @@ cinnamon search "Breaking Bad" -d -e 1-5
 | `webstream` | TV shows & movies from vixsrc.to and vidlink.pro (HLS) |
 | `anime` | Anime from allanime.day via mp4upload |
 
+
 **Optional (install with `cinnamon install <name>`):**
 
 | Name | Needs |
@@ -148,6 +149,8 @@ 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
+
 This project is mostly vibe coded and our lazy ass didnt even write more than 300 lines.
 feel free to give us feedback so we can improve this project and make it as good as possible.
 

cinnamon_cli-0.2.37/cinnamon/__init__.py

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

cinnamon_cli-0.2.37/cinnamon/anilist.py

@@ -0,0 +1,92 @@
+import requests
+
+from .errors import CinnamonError
+
+API = "https://graphql.anilist.co"
+UA = "cinnamon/0.1.0"
+
+_SEARCH_QUERY = """
+query ($search: String, $page: Int) {
+  Page(page: $page, perPage: 20) {
+    media(search: $search, type: ANIME) {
+      id
+      idMal
+      title { romaji english native }
+      episodes
+      status
+      format
+      startDate { year }
+      genres
+    }
+  }
+}
+"""
+
+
+_RELATION_QUERY = """
+query ($search: String) {
+  Page(page: 1, perPage: 5) {
+    media(search: $search, type: ANIME) {
+      id
+      title { romaji english }
+      relations {
+        edges {
+          relationType
+          node {
+            id
+            title { romaji english }
+            episodes
+            status
+            format
+          }
+        }
+      }
+    }
+  }
+}
+"""
+
+
+def search_anime(query):
+    try:
+        resp = requests.post(
+            API,
+            json={"query": _SEARCH_QUERY, "variables": {"search": query, "page": 1}},
+            timeout=15,
+            headers={"User-Agent": UA, "Content-Type": "application/json", "Accept": "application/json"},
+        )
+        resp.raise_for_status()
+        data = resp.json()
+        return data.get("data", {}).get("Page", {}).get("media", [])
+    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}).")
+
+
+def find_sequel(anime_name):
+    """Search AniList for an anime and return its first SEQUEL relation, or None."""
+    try:
+        resp = requests.post(
+            API,
+            json={"query": _RELATION_QUERY, "variables": {"search": anime_name}},
+            timeout=15,
+            headers={"User-Agent": UA, "Content-Type": "application/json", "Accept": "application/json"},
+        )
+        resp.raise_for_status()
+        data = resp.json()
+        media_list = data.get("data", {}).get("Page", {}).get("media", [])
+        for m in media_list:
+            edges = m.get("relations", {}).get("edges", [])
+            for e in edges:
+                if e.get("relationType") == "SEQUEL":
+                    node = e.get("node", {})
+                    title = node.get("title", {})
+                    name = title.get("romaji") or title.get("english") or ""
+                    if name:
+                        return {"id": node["id"], "name": name}
+        return None
+    except (requests.RequestException, CinnamonError):
+        return None

{cinnamon_cli-0.2.33 → cinnamon_cli-0.2.37}/cinnamon/cli.py

@@ -27,6 +27,7 @@ from .config import (
 from .errors import (
     CinnamonError,
     MissingAPIKey,
+    PlayerError,
     PlayerLaunchError,
     PlayerNotFoundError,
     ScraperError,
@@ -38,6 +39,7 @@ from .errors import (
 )
 from .player import download_video, play, ytdlp_install_hint
 from .scrapers import get_scraper, list_scrapers
+from .embedapi import EmbedClient
 from .tmdb import TMDBClient
 
 console = Console()
@@ -160,141 +162,6 @@ def _prompt(message, default=None, password=False):
         return default
 
 
-def _pick_episode_keys(items, label_fn, message):
-    """Keyboard-driven episode picker.
-
-    Press a number once to *select* (highlight) that episode; press the same
-    number again to *confirm* and play it. Arrow keys / j / k move the
-    highlight, Enter confirms the highlighted episode, and q / esc abort.
-
-    Multi-digit entry works too: typing "1" then "2" highlights episode 12,
-    and repeating the final digit (or pressing Enter) confirms it.
-    """
-    if not items:
-        return None
-    n = len(items)
-
-    try:
-        from prompt_toolkit import Application
-        from prompt_toolkit.layout import Layout, Window
-        from prompt_toolkit.layout.controls import FormattedTextControl
-        from prompt_toolkit.key_binding import KeyBindings
-    except Exception:
-        return None
-
-    t = get_theme()
-    accent = _q_hex(t.get("accent", "orange1"))
-    dim = _q_hex(t.get("dim", "grey50"))
-
-    class _State:
-        sel = 0
-        buffer = ""
-        last_key = None
-        last_press = 0.0
-        result = None
-        abort = False
-
-    state = _State()
-    app_ref = [None]
-
-    def _render():
-        lines = [(f"bold fg:{accent}", f"{message}\n")]
-        lines.append((f"fg:{dim}", "  press a number to select · press it again to play · ↑↓/jk move · enter play · q quit\n\n"))
-        start = max(0, min(state.sel - 7, n - 15))
-        end = min(n, start + 15)
-        for i in range(start, end):
-            ep = items[i]
-            label = label_fn(ep)
-            num = f"{i + 1:>3}"
-            if i == state.sel:
-                if state.buffer:
-                    lines.append((f"bold fg:{accent}", f" {_POINTER} {num}  {label}\n"))
-                else:
-                    lines.append((f"bold fg:{accent}", f" {_POINTER} {num}  {label}\n"))
-            else:
-                lines.append((f"fg:{dim}", f"    {num}  {label}\n"))
-        return lines
-
-    control = FormattedTextControl(_render)
-
-    def _confirm():
-        state.result = items[state.sel]
-        if app_ref[0] is not None:
-            app_ref[0].exit()
-
-    def _abort():
-        state.abort = True
-        if app_ref[0] is not None:
-            app_ref[0].exit()
-
-    def _press_digit(d):
-        now = _time.time()
-        if state.last_key is None or (now - state.last_press) > 1.2:
-            state.buffer = str(d)
-        else:
-            state.buffer += str(d)
-        state.last_press = now
-        last_key = state.last_key
-        state.last_key = d
-        try:
-            idx = int(state.buffer) - 1
-        except ValueError:
-            idx = -1
-        if 0 <= idx < n:
-            state.sel = idx
-        # Pressing the same digit twice in a row confirms the highlight.
-        if d == last_key:
-            _confirm()
-            return
-        if app_ref[0] is not None:
-            app_ref[0].invalidate()
-
-    kb = KeyBindings()
-
-    for d in range(10):
-        kb.add(str(d))(lambda event, d=d: _press_digit(d))
-
-    @kb.add("up")
-    @kb.add("k")
-    def _up(event):
-        state.buffer = ""
-        state.last_key = None
-        state.sel = (state.sel - 1) % n
-        event.app.invalidate()
-
-    @kb.add("down")
-    @kb.add("j")
-    def _down(event):
-        state.buffer = ""
-        state.last_key = None
-        state.sel = (state.sel + 1) % n
-        event.app.invalidate()
-
-    @kb.add("enter")
-    def _enter(event):
-        _confirm()
-
-    @kb.add("q")
-    @kb.add("escape")
-    def _quit(event):
-        _abort()
-
-    app = Application(
-        layout=Layout(Window(control, always_scroll=True)),
-        key_bindings=kb,
-        mouse_support=False,
-        full_screen=False,
-    )
-    app_ref[0] = app
-    try:
-        app.run()
-    except Exception:
-        return None
-    if state.abort:
-        return None
-    return state.result
-
-
 _UPDATE_CHECK_CACHE = 86400  # 24 hours
 
 
@@ -380,14 +247,10 @@ def _get_tmdb():
     try:
         return TMDBClient()
     except MissingAPIKey:
-        _print_error(
-            "TMDB API key not configured.",
-            'Run "cinnamon setup" for a step-by-step guide to get a free key.',
-        )
-        raise SystemExit(1)
+        return EmbedClient()
 
 
-def _handle_tmdb_error(fn):
+def _handle_errors(fn):
     @wraps(fn)
     def wrapper(*a, **kw):
         try:
@@ -402,8 +265,12 @@ def _handle_tmdb_error(fn):
             _print_error(str(e))
         except TMDBError as e:
             _print_error(str(e))
+        except (ScraperError, PlayerError) as e:
+            _print_error(str(e))
         except MissingAPIKey:
             _get_tmdb()
+        except Exception as e:
+            _print_error("Something went wrong.", str(e)[:500])
 
     return wrapper
 
@@ -587,17 +454,19 @@ def _play_with_menu(show, season_num, ep_start, ep_end, ep_name, scraper, player
         theme = get_theme()
         console.print()
 
+        choices = [
+            questionary.Choice(title="Next episode", value="next"),
+            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"),
+        ]
         try:
-            choice = _select(
-                "Options",
-                choices=[
-                    questionary.Choice(title="Next episode", value="next"),
-                    questionary.Choice(title="Previous episode", value="prev"),
-                    questionary.Choice(title="Replay", value="replay"),
-                    questionary.Choice(title="Change quality", value="quality"),
-                    questionary.Choice(title="Quit", value="quit"),
-                ],
-            )
+            choice = _select("Options", choices=choices)
         except Exception:
             return
 
@@ -611,6 +480,29 @@ 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(
@@ -740,7 +632,7 @@ def _resolve_and_play(show, season_num, ep_num, ep_name, scraper, player, qualit
             return None  # magnets: can't wait for process
         else:
             console.print(f"  [{theme['info']}]Opening in {player_choice.upper()}...[/{theme['info']}]")
-            return play(result.m3u8_url, title=result.title, player=player_choice, season=season_num, episode=ep_num, referer=result.referer)
+            return play(result.m3u8_url, title=result.title, player=player_choice, season=season_num, episode=ep_num, referer=result.referer, subtitle_url=result.subtitle_url)
     except PlayerNotFoundError as e:
         _print_error(str(e))
         return None
@@ -853,7 +745,8 @@ def cli(ctx, setup):
                 border_style="bright_yellow",
             ))
             console.print()
-            if Confirm.ask("No API key found. Run setup?", default=True):
+            console.print("  [dim]Search & watch will use an experimental proxy (no key needed).[/dim]")
+            if Confirm.ask("Add a TMDB API key for better results?", default=False):
                 ctx.invoke(setup_cmd)
                 return
         theme = get_theme()
@@ -899,7 +792,12 @@ def _setup_wizard():
         else:
             api_key = _setup_api_key()
     else:
-        api_key = _setup_api_key()
+        console.print("  No TMDB API key found.")
+        console.print("  [dim]Without it, search & watch use an experimental 2embed proxy (less reliable).[/dim]")
+        if Confirm.ask("  Add a TMDB API key now?", default=True):
+            api_key = _setup_api_key()
+        else:
+            api_key = None
 
     if api_key and api_key != existing_key:
         cfg["tmdb_api_key"] = api_key
@@ -978,7 +876,7 @@ def _setup_api_key():
         webbrowser.open("https://www.themoviedb.org/signup")
 
     console.print()
-    api_key = Prompt.ask("[bold]Paste your TMDB API Key[/bold]")
+    api_key = Prompt.ask("[bold]Paste your TMDB API Key[/bold] [dim](leave empty to skip)[/dim]")
     if not api_key.strip():
         return None
 
@@ -1015,7 +913,7 @@ def _theme_preview(name):
 @click.option("-q", "--quality", help="Video quality: 480p, 720p, 1080p, best, worst")
 @click.option("-d", "--download", is_flag=True, help="Download instead of streaming")
 @click.option("--info-only", is_flag=True, help="Show the m3u8 URL without playing")
-@_handle_tmdb_error
+@_handle_errors
 def search(query, media_type, season, ep_str, scraper, player, quality, download, info_only):
     """Search for a show or movie, pick one, and watch it."""
     _check_for_updates()
@@ -1100,7 +998,7 @@ def search(query, media_type, season, ep_str, scraper, player, quality, download
 @click.option("-d", "--download", is_flag=True, help="Download instead of streaming")
 @click.option("--info-only", is_flag=True, help="Show the m3u8 URL without playing")
 @click.option("-q", "--quality", help="Video quality: 480p, 720p, 1080p, best, worst")
-@_handle_tmdb_error
+@_handle_errors
 def watch(query, tmdb_id, media_type, season, ep_str, scraper, player, download, info_only, quality):
     """Browse episodes interactively and play one."""
     _check_for_updates()
@@ -1118,7 +1016,7 @@ def watch(query, tmdb_id, media_type, season, ep_str, scraper, player, download,
         if season is not None and ep_start is not None:
             _play_with_menu(show, season, ep_start, ep_end, f"E{ep_start}", scraper, player, quality, info_only, download)
         else:
-            _interactive_episode_picker(None, show, scraper, player, quality, info_only, ep_start=ep_start, ep_end=ep_end)
+            _interactive_episode_picker(_get_tmdb(), show, scraper, player, quality, info_only, ep_start=ep_start, ep_end=ep_end)
         return
 
     tmdb = _get_tmdb()
@@ -1288,15 +1186,15 @@ def _interactive_episode_picker(tmdb, show, scraper, player, quality, info_only,
         return
 
     try:
-        def _ep_label(ep):
+        ep_choices = []
+        for ep in episodes:
             ep_num = ep.get("episode_number", "?")
             ep_title = ep.get("name", f"Episode {ep_num}")
-            return f"E{ep_num:02d}  {ep_title}" if isinstance(ep_num, int) else f"{ep_num}  {ep_title}"
-
-        ep_chosen = _pick_episode_keys(
-            episodes,
-            _ep_label,
-            f"Season {season_num} — select an episode",
+            label = f"E{ep_num:02d}  {ep_title}" if isinstance(ep_num, int) else f"{ep_num}  {ep_title}"
+            ep_choices.append(questionary.Choice(title=label, value=ep))
+        ep_chosen = _select(
+            f"Season {season_num} - Select an episode:",
+            choices=ep_choices,
         )
         if not ep_chosen:
             return
@@ -1320,6 +1218,7 @@ def _interactive_episode_picker(tmdb, show, scraper, player, quality, info_only,
 @click.argument("url")
 @click.option("--player", help="Player: vlc, mpv, or auto")
 @click.option("--title", default="", help="Media title")
+@_handle_errors
 def play_url(url, player, title):
     """Play a direct m3u8 URL in VLC or mpv."""
     config = load_config()
@@ -1340,7 +1239,7 @@ def play_url(url, player, title):
 
 
 @cli.command()
-@_handle_tmdb_error
+@_handle_errors
 def resume():
     """List interrupted downloads and resume one."""
     from .downloads import get, list_all, update as _track_update
@@ -1609,6 +1508,7 @@ def config_scraper_show(name):
 
 
 @cli.command()
+@_handle_errors
 def scrapers():
     """List available scrapers."""
     all_scrapers = list_scrapers()
@@ -1642,6 +1542,7 @@ def scrapers():
 
 @cli.command()
 @click.argument("name")
+@_handle_errors
 def install(name):
     """Install an optional scraper (vidsrc, torrentio)."""
     from .scrapers import _OPTIONAL_SCRAPERS, install_optional
@@ -1668,6 +1569,7 @@ def install(name):
 @click.option("--info-only", is_flag=True, help="Show the stream URL without playing")
 @click.option("--sub", "prefer_sub", is_flag=True, help="Prefer subtitled audio")
 @click.option("--dub", "prefer_dub", is_flag=True, help="Prefer dubbed audio")
+@_handle_errors
 def anime(query, season, ep_str, download, player, quality, info_only, prefer_sub, prefer_dub):
     """Search anime via AniList (no API key needed) and stream from allanime."""
     _check_for_updates()
@@ -1683,7 +1585,7 @@ def anime(query, season, ep_str, download, player, quality, info_only, prefer_su
         return
 
     def _title(m):
-        return m.get("title", {}).get("romaji") or m.get("title", {}).get("english") or m.get("title", {}).get("native", "?")
+        return m.get("title", {}).get("english") or m.get("title", {}).get("romaji") or m.get("title", {}).get("native", "?")
     def _year(m):
         sd = m.get("startDate") or {}
         return str(sd.get("year", "")) if sd.get("year") else ""
@@ -1785,7 +1687,11 @@ def _run_anime_flow(show_name, episodes_detail, season=None, ep_str=None, player
         _print_error(f"No episodes for season {season}.")
         return
 
-    tt_keys = list(season_data.keys())
+    tt_keys = [k for k in season_data if season_data[k]]
+    if not tt_keys:
+        _print_error(f"No episodes available for season {season}.")
+        return
+
     if translation and translation in tt_keys:
         tt = translation
     elif "sub" in tt_keys and len(tt_keys) > 1:
@@ -1815,13 +1721,9 @@ def _run_anime_flow(show_name, episodes_detail, season=None, ep_str=None, player
             ep_end = max_ep
     else:
         try:
-            sorted_eps = sorted(episodes)
-            ep_chosen = _pick_episode_keys(
-                sorted_eps,
-                lambda e: f"Episode {e}",
-                "Select an episode",
-            )
-            if ep_chosen is None:
+            ep_choices = [questionary.Choice(title=f"Episode {e}", value=e) for e in sorted(episodes)]
+            ep_chosen = _select("Select an episode:", choices=ep_choices)
+            if not ep_chosen:
                 return
             ep_start = int(ep_chosen)
         except Exception:
@@ -1904,6 +1806,7 @@ def update():
 @cli.command()
 @click.argument("query", nargs=-1, required=False)
 @click.option("--clear", is_flag=True, help="Clear all watch history")
+@_handle_errors
 def history(query, clear):
     """Show watch history and resume from last episode."""
     from .history import clear_history, get_history, list_history