Fix issue #408

Author: Arrowar

.github/workflows/build.yml

@@ -112,6 +112,7 @@ jobs:
             --hidden-import=qbittorrentapi --hidden-import=qbittorrent \
             --hidden-import=bs4 --hidden-import=httpx --hidden-import=rich --hidden-import=tqdm \
             --hidden-import=m3u8 --hidden-import=psutil --hidden-import=unidecode \
+            --hidden-import=python-dotenv --hidden-import=dotenv \
             --hidden-import=jsbeautifier --hidden-import=jsbeautifier.core \
             --hidden-import=jsbeautifier.javascript --hidden-import=jsbeautifier.javascript.beautifier \
             --hidden-import=jsbeautifier.unpackers --hidden-import=jsbeautifier.unpackers.packer \

StreamingCommunity/Api/Site/crunchyroll/film.py

@@ -54,11 +54,13 @@ def download_film(select_title: MediaItem) -> str:
 
     # Generate mpd and license URLs
     url_id = select_title.get('url').split('/')[-1]
-    mpd_url, mpd_headers, mpd_list_sub = get_playback_session(client, url_id)
+    mpd_url, mpd_headers, mpd_list_sub, token, audio_locale = get_playback_session(client, url_id)
+    
+    # Parse playback token from mpd_url
     parsed_url = urlparse(mpd_url)
     query_params = parse_qs(parsed_url.query)
 
-    # Download the episode
+    # Download the film
     dash_process = DASH_Downloader(
         license_url='https://www.crunchyroll.com/license/v1/license/widevine',
         mpd_url=mpd_url,
@@ -86,9 +88,10 @@ def download_film(select_title: MediaItem) -> str:
         except Exception: 
             pass
 
-    # Delete stream after download
-    token = query_params['playbackGuid'][0]
-    if token:
-        client.delete_active_stream(url_id, token)
+    # Delete stream after download to avoid TOO_MANY_ACTIVE_STREAMS
+    playback_token = token or query_params.get('playbackGuid', [None])[0]
+    if playback_token:
+        client.delete_active_stream(url_id, playback_token)
+        console.print("[dim]✓ Playback session closed[/dim]")
 
     return status['path'], status['stopped']

StreamingCommunity/Api/Site/crunchyroll/series.py

@@ -41,7 +41,7 @@
 extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
-def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str,bool]:
+def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str, bool]:
     """
     Downloads a specific episode from a specified season.
 
@@ -59,7 +59,6 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Get episode information
     obj_episode = scrape_serie.selectEpisode(index_season_selected, index_episode_selected-1)
-
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.get('name')}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
@@ -68,8 +67,9 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Generate mpd and license URLs
     url_id = obj_episode.get('url').split('/')[-1]
-    
-    mpd_url, mpd_headers, mpd_list_sub = get_playback_session(client, url_id)
+
+    # Get playback session with token for cleanup
+    mpd_url, mpd_headers, mpd_list_sub, token, audio_locale = get_playback_session(client, url_id)
     parsed_url = urlparse(mpd_url)
     query_params = parse_qs(parsed_url.query)
 
@@ -101,9 +101,11 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         except Exception: 
             pass
 
-    # Delete episode stream
-    token = query_params['playbackGuid'][0]
-    client.delete_active_stream(url_id, token)
+    # Delete episode stream to avoid TOO_MANY_ACTIVE_STREAMS
+    playback_token = token or query_params.get('playbackGuid', [None])[0]
+    if playback_token:
+        client.delete_active_stream(url_id, playback_token)
+        console.print("[dim]✓ Playback session closed[/dim]")
 
     return status['path'], status['stopped']
 

StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -1,13 +1,11 @@
 # 16.03.25
 
-
 # External libraries
 from rich.console import Console
 
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.http_client import create_client_curl
 from StreamingCommunity.Util.table import TVShowManager
 
 
@@ -36,19 +34,16 @@ def title_search(query: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Check if device_id or etp_rt is present
     config = config_manager.get_dict("SITE_LOGIN", "crunchyroll")
     if not config.get('device_id') or not config.get('etp_rt'):
         console.print("[bold red] device_id or etp_rt is missing or empty in config.json.[/bold red]")
         raise Exception("device_id or etp_rt is missing or empty in config.json.")
 
-    # Initialize Crunchyroll client
     client = CrunchyrollClient()
     if not client.start():
         console.print("[bold red] Failed to authenticate with Crunchyroll.[/bold red]")
         raise Exception("Failed to authenticate with Crunchyroll.")
 
-    # Build new Crunchyroll API search URL
     api_url = "https://www.crunchyroll.com/content/v2/discover/search"
 
     params = {
@@ -60,12 +55,10 @@ def title_search(query: str) -> int:
         "locale": "it-IT"
     }
 
-    headers = client._get_headers()
-
     console.print(f"[cyan]Search url: [yellow]{api_url}")
 
     try:
-        response = create_client_curl(headers=headers).get(api_url, params=params)
+        response = client._request_with_retry('GET', api_url, params=params)
         response.raise_for_status()
 
     except Exception as e:
@@ -88,18 +81,20 @@ def title_search(query: str) -> int:
             elif item.get("type") == "series":
                 meta = item.get("series_metadata", {})
 
+                # Heuristic: single episode series might be films
                 if meta.get("episode_count") == 1 and meta.get("season_count", 1) == 1 and meta.get("series_launch_year"):
-                    tipo = "film" if "film" in item.get("description", "").lower() or "movie" in item.get("description", "").lower() else "tv"
+                    description = item.get("description", "").lower()
+                    if "film" in description or "movie" in description:
+                        tipo = "film"
+                    else:
+                        tipo = "tv"
                 else:
                     tipo = "tv"
-
             else:
                 continue
 
             url = ""
-            if tipo == "tv":
-                url = f"https://www.crunchyroll.com/series/{item.get('id')}"
-            elif tipo == "film":
+            if tipo in ("tv", "film"):
                 url = f"https://www.crunchyroll.com/series/{item.get('id')}"
             else:
                 continue