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

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

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

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

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

@@ -160,6 +160,141 @@ 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
 
 
@@ -1153,15 +1288,15 @@ def _interactive_episode_picker(tmdb, show, scraper, player, quality, info_only,
         return
 
     try:
-        ep_choices = []
-        for ep in episodes:
+        def _ep_label(ep):
             ep_num = ep.get("episode_number", "?")
             ep_title = ep.get("name", f"Episode {ep_num}")
-            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,
+            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",
         )
         if not ep_chosen:
             return
@@ -1680,9 +1815,13 @@ def _run_anime_flow(show_name, episodes_detail, season=None, ep_str=None, player
             ep_end = max_ep
     else:
         try:
-            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:
+            sorted_eps = sorted(episodes)
+            ep_chosen = _pick_episode_keys(
+                sorted_eps,
+                lambda e: f"Episode {e}",
+                "Select an episode",
+            )
+            if ep_chosen is None:
                 return
             ep_start = int(ep_chosen)
         except Exception:

{cinnamon_cli-0.2.31 → cinnamon_cli-0.2.33}/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]

{cinnamon_cli-0.2.31 → cinnamon_cli-0.2.33}/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.31 → cinnamon_cli-0.2.33/cinnamon_cli.egg-info}/PKG-INFO

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

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

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