StreamingCommunity 3.2.8__py3-none-any.whl → 3.3.0__py3-none-any.whl

StreamingCommunity/Api/Site/crunchyroll/film.py

@@ -54,13 +54,13 @@ def download_film(select_title: MediaItem) -> str:
     query_params = parse_qs(parsed_url.query)
 
     # Download the episode
-    r_proc = DASH_Downloader(
+    dash_process = DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url='https://www.crunchyroll.com/license/v1/license/widevine',
         mpd_url=mpd_url,
         output_path=os.path.join(mp4_path, mp4_name),
     )
-    r_proc.parse_manifest(custom_headers=mpd_headers)
+    dash_process.parse_manifest(custom_headers=mpd_headers)
 
     # Create headers for license request
     license_headers = mpd_headers.copy()
@@ -69,14 +69,16 @@ def download_film(select_title: MediaItem) -> str:
         "x-cr-video-token": query_params['playbackGuid'][0],
     })
 
-    if r_proc.download_and_decrypt(custom_headers=license_headers):
-        r_proc.finalize_output()
+    if dash_process.download_and_decrypt(custom_headers=license_headers):
+        dash_process.finalize_output()
 
     # Get final output path and status
-    status = r_proc.get_status()
+    status = dash_process.get_status()
 
     if status['error'] is not None and status['path']:
-        try: os.remove(status['path'])
-        except Exception: pass
+        try: 
+            os.remove(status['path'])
+        except Exception: 
+            pass
 
     return status['path'], status['stopped']

StreamingCommunity/Api/Site/crunchyroll/series.py

@@ -71,13 +71,13 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     query_params = parse_qs(parsed_url.query)
 
     # Download the episode
-    r_proc = DASH_Downloader(
+    dash_process = DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url='https://www.crunchyroll.com/license/v1/license/widevine',
         mpd_url=mpd_url,
         output_path=os.path.join(mp4_path, mp4_name),
     )
-    r_proc.parse_manifest(custom_headers=mpd_headers)
+    dash_process.parse_manifest(custom_headers=mpd_headers)
 
     # Create headers for license request
     license_headers = mpd_headers.copy()
@@ -86,15 +86,17 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         "x-cr-video-token": query_params['playbackGuid'][0],
     })
 
-    if r_proc.download_and_decrypt(custom_headers=license_headers):
-        r_proc.finalize_output()
+    if dash_process.download_and_decrypt(custom_headers=license_headers):
+        dash_process.finalize_output()
 
     # Get final output path and status
-    status = r_proc.get_status()
+    status = dash_process.get_status()
 
     if status['error'] is not None and status['path']:
-        try: os.remove(status['path'])
-        except Exception: pass
+        try: 
+            os.remove(status['path'])
+        except Exception: 
+            pass
 
     # Delete episode stream
     delete_stream_episode(url_id, query_params['playbackGuid'][0], mpd_headers)

StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -1,5 +1,8 @@
 # 16.03.25
 
+import os
+import sys
+
 
 # External libraries
 from curl_cffi import requests
@@ -8,6 +11,7 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.os import get_wvd_path
 from StreamingCommunity.Util.headers import get_headers
 from StreamingCommunity.Util.table import TVShowManager
 
@@ -38,8 +42,19 @@ def title_search(query: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
+    # Check CDM file before usage
+    cdm_device_path = get_wvd_path()
+    if not cdm_device_path or not isinstance(cdm_device_path, (str, bytes, os.PathLike)) or not os.path.isfile(cdm_device_path):
+        console.print(f"[bold red] CDM file not found or invalid path: {cdm_device_path}[/bold red]")
+        sys.exit(0)
+
+    # Check if x_cr_tab_id or etp_rt is present
+    if config_manager.get_dict("SITE_LOGIN", "crunchyroll")['x_cr_tab_id'] is None or config_manager.get_dict("SITE_LOGIN", "crunchyroll")['x_cr_tab_id'] == "" or config_manager.get_dict("SITE_LOGIN", "crunchyroll")['etp_rt'] is None or config_manager.get_dict("SITE_LOGIN", "crunchyroll")['etp_rt'] == "":
+        console.print(f"[bold red] x_cr_tab_id or etp_rt is missing or empty.[/bold red]")
+        sys.exit(0)
+
     # Build new Crunchyroll API search URL
-    api_url = f"https://www.crunchyroll.com/content/v2/discover/search"
+    api_url = "https://www.crunchyroll.com/content/v2/discover/search"
 
     params = {
         "q": query,

StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -12,6 +12,7 @@ from rich.prompt import Prompt
 from StreamingCommunity.Api.Template import get_select_title
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
 
 # Logic class
@@ -39,6 +40,14 @@ def process_search_result(select_title, selections=None):
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
     """
+    if not select_title:
+        if site_constant.TELEGRAM_BOT:
+            bot = get_bot_instance()
+            bot.send_message("No title selected or selection cancelled.", None)
+        else:
+            console.print("[yellow]No title selected or selection cancelled.")
+        return
+    
     season_selection = None
     episode_selection = None
     
@@ -59,27 +68,44 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
     """
+    bot = None
+    if site_constant.TELEGRAM_BOT:
+        try:
+            from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
+            bot = get_bot_instance()
+        except Exception:
+            bot = None
+
     if direct_item:
         select_title = MediaItem(**direct_item)
         process_search_result(select_title, selections)
         return
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
-    
-    # Search on database
-    len_database = title_search(quote_plus(string_to_search))
+        actual_search_query = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
+    else:
+        actual_search_query = string_to_search
+
+    # Handle empty input
+    if not actual_search_query:
+        if bot:
+            if actual_search_query is None:
+                bot.send_message("Search term not provided or operation cancelled. Returning.", None)
+        return
+
+    # Search on database (preserve quote_plus usage)
+    len_database = title_search(quote_plus(actual_search_query))
 
     # If only the database is needed, return the manager
     if get_onlyDatabase:
         return media_search_manager
 
     if len_database > 0:
-        select_title = get_select_title(table_show_manager, media_search_manager,len_database)
+        select_title = get_select_title(table_show_manager, media_search_manager, len_database)
         process_search_result(select_title, selections)
-
     else:
-
-        # If no results are found, ask again
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-        search()
+        if bot:
+            bot.send_message(f"No results found for: '{actual_search_query}'", None)
+        else:
+            console.print(f"\n[red]Nothing matching was found for[white]: [purple]{actual_search_query}")
+        return

StreamingCommunity/Api/Site/guardaserie/series.py

@@ -55,7 +55,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scap
     # Get episode information
     obj_episode = scape_info_serie.selectEpisode(index_season_selected, index_episode_selected-1)
     index_season_selected = dynamic_format_number(str(index_season_selected))
-    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [bold magenta]{obj_episode.get('name')}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
+    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scape_info_serie.tv_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
     mp4_name = f"{map_episode_title(scape_info_serie.tv_name, index_season_selected, index_episode_selected, obj_episode.get('name'))}.mp4"
@@ -68,16 +68,18 @@ def download_video(index_season_selected: int, index_episode_selected: int, scap
     master_playlist = video_source.get_playlist()
     
     # Download the film using the m3u8 playlist, and output filename
-    r_proc = HLS_Downloader(
+    hls_process = HLS_Downloader(
         m3u8_url=master_playlist, 
         output_path=os.path.join(mp4_path, mp4_name)
     ).start()
      
-    if r_proc['error'] is not None:
-        try: os.remove(r_proc['path'])
-        except: pass
+    if hls_process['error'] is not None:
+        try: 
+            os.remove(hls_process['path'])
+        except Exception: 
+            pass
 
-    return r_proc['path'], r_proc['stopped']
+    return hls_process['path'], hls_process['stopped']
 
 
 def download_episode(scape_info_serie: GetSerieInfo, index_season_selected: int, download_all: bool = False, episode_selection: str = None) -> None:

StreamingCommunity/Api/Site/guardaserie/site.py

@@ -1,8 +1,5 @@
 # 09.06.24
 
-import sys
-
-
 # External libraries
 import httpx
 from bs4 import BeautifulSoup

StreamingCommunity/Api/Site/guardaserie/util/ScrapeSerie.py

@@ -53,8 +53,7 @@ class GetSerieInfo:
             seasons_number = len(table_content.find_all("li"))
             
             # Try to get the title, with fallback
-            title_element = soup.find("h1", class_="entry-title")
-            self.tv_name = title_element.get_text(strip=True) if title_element else "Unknown Title"
+            self.tv_name = soup.find('h1', class_="front_title").get_text(strip=True) if soup.find('h1', class_="front_title") else "Unknown Series"
 
             return seasons_number
 

StreamingCommunity/Api/Site/mediasetinfinity/__init__.py

@@ -10,6 +10,7 @@ from rich.prompt import Prompt
 from StreamingCommunity.Api.Template import get_select_title
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
 
 # Logic class
@@ -22,7 +23,7 @@ from .film import download_film
 indice = 3
 _useFor = "Film_&_Serie"
 _priority = 0
-_engineDownload = "hls"
+_engineDownload = "dash"
 _deprecate = False
 
 msg = Prompt()
@@ -47,6 +48,14 @@ def process_search_result(select_title, selections=None):
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
     """
+    if not select_title:
+        if site_constant.TELEGRAM_BOT:
+            bot = get_bot_instance()
+            bot.send_message("No title selected or selection cancelled.", None)
+        else:
+            console.print("[yellow]No title selected or selection cancelled.")
+        return
+    
     if select_title.type == 'tv':
         season_selection = None
         episode_selection = None
@@ -71,26 +80,42 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
     """
+    bot = None
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+    
     if direct_item:
         select_title = MediaItem(**direct_item)
         process_search_result(select_title, selections)
         return
-
-    if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
-
-    # Search on database
-    len_database = title_search(string_to_search)
+    
+    # Get the user input for the search term
+    actual_search_query = get_user_input(string_to_search)
+
+    # Handle cases where user input is empty, or 'back' was handled (sys.exit or None return)
+    if not actual_search_query:
+        if bot:
+            if actual_search_query is None: # Specifically for timeout from bot.ask or failed restart
+                bot.send_message("Search term not provided or operation cancelled. Returning.", None)
+        return
+    
+    # Perform the database search
+    len_database = title_search(actual_search_query)
 
     # If only the database is needed, return the manager
     if get_onlyDatabase:
         return media_search_manager
-    
+
     if len_database > 0:
-        select_title = get_select_title(table_show_manager, media_search_manager,len_database)
+        select_title = get_select_title(table_show_manager, media_search_manager, len_database)
         process_search_result(select_title, selections)
     
     else:
-        # If no results are found, ask again
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-        search()
+        if bot:
+            bot.send_message(f"No results found for: '{actual_search_query}'", None)
+        else:
+            console.print(f"\n[red]Nothing matching was found for[white]: [purple]{actual_search_query}")
+
+        # Do not call search() recursively here to avoid infinite loops on no results.
+        # The flow should return to the caller (e.g., main menu in run.py).
+        return

StreamingCommunity/Api/Site/mediasetinfinity/film.py

@@ -49,37 +49,31 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
     # Generate mpd and license URLs
     bearer = get_bearer_token()
 
-    # Extract ID from the episode URL
-    episode_id = select_title.url.split('_')[-1]
-    if "http" in episode_id:
-        try: episode_id = select_title.url.split('/')[-1]
-        except Exception:
-            console.print(f"[red]Error:[/red] Failed to parse episode ID from URL: {select_title.url}")
-            return None, True
-
-    playback_json = get_playback_url(bearer, episode_id)
+    playback_json = get_playback_url(bearer, select_title.id)
     tracking_info = get_tracking_info(bearer, playback_json)[0]
 
     license_url = generate_license_url(bearer, tracking_info)
     mpd_url = get_manifest(tracking_info['video_src'])
 
     # Download the episode
-    r_proc =  DASH_Downloader(
+    dash_process =  DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url=license_url,
         mpd_url=mpd_url,
         output_path=mp4_path,
     )
-    r_proc.parse_manifest(custom_headers=get_headers())
+    dash_process.parse_manifest(custom_headers=get_headers())
 
-    if r_proc.download_and_decrypt():
-        r_proc.finalize_output()
+    if dash_process.download_and_decrypt():
+        dash_process.finalize_output()
 
     # Get final output path and status
-    status = r_proc.get_status()
+    status = dash_process.get_status()
 
     if status['error'] is not None and status['path']:
-        try: os.remove(status['path'])
-        except Exception: pass
+        try: 
+            os.remove(status['path'])
+        except Exception: 
+            pass
 
     return status['path'], status['stopped']

StreamingCommunity/Api/Site/mediasetinfinity/series.py

@@ -56,7 +56,7 @@ 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"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
+    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
     mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
@@ -64,39 +64,33 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Generate mpd and license URLs
     bearer = get_bearer_token()
-    
-    # Extract ID from the episode URL
-    episode_id = obj_episode.url.split('_')[-1]
-    if "http" in episode_id:
-        try: episode_id = obj_episode.url.split('/')[-1]
-        except Exception:
-            console.print(f"[red]Error:[/red] Failed to parse episode ID from URL: {obj_episode.url}")
-            return None, True
-
-    playback_json = get_playback_url(bearer, episode_id)
+
+    playback_json = get_playback_url(bearer, obj_episode.id)
     tracking_info = get_tracking_info(bearer, playback_json)[0]
 
     license_url = generate_license_url(bearer, tracking_info)
     mpd_url = get_manifest(tracking_info['video_src'])
 
     # Download the episode
-    r_proc = DASH_Downloader(
+    dash_process = DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url=license_url,
         mpd_url=mpd_url,
         output_path=os.path.join(mp4_path, mp4_name),
     )
-    r_proc.parse_manifest(custom_headers=get_headers())
+    dash_process.parse_manifest(custom_headers=get_headers())
 
-    if r_proc.download_and_decrypt():
-        r_proc.finalize_output()
+    if dash_process.download_and_decrypt():
+        dash_process.finalize_output()
 
     # Get final output path and status
-    status = r_proc.get_status()
+    status = dash_process.get_status()
 
     if status['error'] is not None and status['path']:
-        try: os.remove(status['path'])
-        except Exception: pass
+        try: 
+            os.remove(status['path'])
+        except Exception: 
+            pass
 
     return status['path'], status['stopped']
     

StreamingCommunity/Api/Site/mediasetinfinity/site.py

@@ -1,5 +1,9 @@
 # 25.07.25
 
+import os
+import sys
+
+
 # External libraries
 import httpx
 from rich.console import Console
@@ -7,6 +11,7 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.os import get_wvd_path
 from StreamingCommunity.Util.headers import get_headers
 from StreamingCommunity.Util.table import TVShowManager
 from StreamingCommunity.Api.Template.config_loader import site_constant
@@ -37,7 +42,18 @@ def title_search(query: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    search_url = f'https://api-ott-prod-fe.mediaset.net/PROD/play/reco/anonymous/v2.0'
+    # Check CDM file before usage
+    cdm_device_path = get_wvd_path()
+    if not cdm_device_path or not isinstance(cdm_device_path, (str, bytes, os.PathLike)) or not os.path.isfile(cdm_device_path):
+        console.print(f"[bold red] CDM file not found or invalid path: {cdm_device_path}[/bold red]")
+        sys.exit(0)
+
+    # Check if beToken is present
+    if config_manager.get_dict("SITE_LOGIN", "mediasetinfinity")["beToken"] is None or config_manager.get_dict("SITE_LOGIN", "mediasetinfinity")["beToken"] == "":
+        console.print(f"[bold red] beToken is missing or empty.[/bold red]")
+        sys.exit(0)
+
+    search_url = 'https://api-ott-prod-fe.mediaset.net/PROD/play/reco/account/v2.0'
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     params = {
@@ -48,11 +64,10 @@ def title_search(query: str) -> int:
         'contentId': '',
         'property': 'search',
         'tenant': 'play-prod-v2',
-        'userContext': 'iwiAeyJwbGF0Zm9ybSI6IndlYiJ9Aw==',
         'aresContext': '',
+        'clientId': 'client_id',
         'page': '1',
         'hitsPerPage': '8',
-        'clientId': 'client_id'
     }
 
     headers = get_headers()