StreamingCommunity 3.2.9__py3-none-any.whl → 3.3.1__py3-none-any.whl

StreamingCommunity/Api/Site/raiplay/__init__.py

@@ -1,5 +1,8 @@
 # 21.05.24
 
+import sys
+import subprocess
+
 
 # External library
 from rich.console import Console
@@ -10,6 +13,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
@@ -32,8 +36,40 @@ console = Console()
 def get_user_input(string_to_search: str = None):
     """
     Asks the user to input a search term.
+    Handles both Telegram bot input and direct input.
+    If string_to_search is provided, it's returned directly (after stripping).
     """
-    return msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
+    if string_to_search is not None:
+        return string_to_search.strip()
+
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+        user_response = bot.ask(
+            "key_search", # Request type
+            "Enter the search term\nor type 'back' to return to the menu: ",
+            None
+        )
+
+        if user_response is None:
+            bot.send_message("Timeout: No search term entered.", None)
+            return None
+
+        if user_response.lower() == 'back':
+            bot.send_message("Returning to the main menu...", None)
+            
+            try:
+                # Restart the script
+                subprocess.Popen([sys.executable] + sys.argv)
+                sys.exit()
+                
+            except Exception as e:
+                bot.send_message(f"Error during restart attempt: {e}", None)
+                return None # Return None if restart fails
+        
+        return user_response.strip()
+        
+    else:
+        return msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
 
 def process_search_result(select_title, selections=None):
     """
@@ -43,7 +79,18 @@ def process_search_result(select_title, selections=None):
         select_title (MediaItem): The selected media item
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
+
+    Returns:
+        bool: True if processing was successful, False otherwise
     """
+    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 False
+    
     if select_title.type == 'tv':
         season_selection = None
         episode_selection = None
@@ -53,9 +100,11 @@ def process_search_result(select_title, selections=None):
             episode_selection = selections.get('episode')
 
         download_series(select_title, season_selection, episode_selection)
+        return True
 
     else:
         download_film(select_title)
+        return True
 
 def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None, selections: dict = None):
     """
@@ -68,26 +117,43 @@ 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 True
+    
+    # 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
-
-    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)
+    
+    # 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)
+        return True
     
     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/raiplay/film.py

@@ -1,6 +1,7 @@
 # 21.05.24
 
 import os
+import sys
 from typing import Tuple
 
 
@@ -68,7 +69,7 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
         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]")
-            return None
+            sys.exit(0)
 
         license_url = generate_license_url(select_title.mpd_id)
 

StreamingCommunity/Api/Site/raiplay/series.py

@@ -1,6 +1,7 @@
 # 21.05.24
 
 import os
+import sys
 from typing import Tuple
 
 
@@ -10,7 +11,7 @@ from rich.prompt import Prompt
 
 
 # Internal utilities
-from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.headers import get_headers, get_userAgent
 from StreamingCommunity.Util.os import get_wvd_path
 from StreamingCommunity.Util.message import start_message
 
@@ -57,7 +58,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] → [cyan]{scrape_serie.series_name}[/cyan] \\ [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] → [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path
     mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
@@ -66,6 +67,15 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     # Get streaming URL
     master_playlist = VideoSource.extract_m3u8_url(obj_episode.url)
 
+    # HLS
+    if ".mpd" not in master_playlist:
+        r_proc = HLS_Downloader(
+            m3u8_url=master_playlist,
+            output_path=os.path.join(mp4_path, mp4_name)
+        ).start()
+    # Get streaming URL
+    master_playlist = VideoSource.extract_m3u8_url(obj_episode.url)
+
     # HLS
     if ".mpd" not in master_playlist:
         r_proc = HLS_Downloader(
@@ -80,19 +90,23 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         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]")
-            return None
+            sys.exit(0)
 
-        license_url = generate_license_url(obj_episode.mpd_id)
+        full_license_url = generate_license_url(obj_episode.mpd_id)
+        license_headers = {
+            'nv-authorizations': full_license_url.split("?")[1].split("=")[1],
+            'user-agent': get_userAgent(),
+        }
 
         dash_process = DASH_Downloader(
             cdm_device=cdm_device_path,
-            license_url=license_url,
+            license_url=full_license_url.split("?")[0],
             mpd_url=master_playlist,
             output_path=os.path.join(mp4_path, mp4_name),
         )
         dash_process.parse_manifest(custom_headers=get_headers())
         
-        if dash_process.download_and_decrypt():
+        if dash_process.download_and_decrypt(custom_headers=license_headers):
             dash_process.finalize_output()
 
         # Get final output path and status
@@ -192,4 +206,4 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         if len(list_season_select) > 1 or index_season_selected == "*":
             download_episode(season_number, scrape_serie, download_all=True)
         else:
-            download_episode(season_number, scrape_serie, download_all=False, episode_selection=episode_selection)
+            download_episode(season_number, scrape_serie, download_all=False, episode_selection=episode_selection)

StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -15,7 +15,6 @@ 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
 from .site import title_search, table_show_manager, media_search_manager
 from .film import download_film
@@ -24,7 +23,7 @@ from .series import download_series
 
 # Variable
 indice = 0
-_useFor = "Film_&_Serie" # "Movies_&_Series"
+_useFor = "Film_&_Serie"
 _priority = 0
 _engineDownload = "hls"
 _deprecate = False
@@ -79,6 +78,8 @@ def process_search_result(select_title, selections=None):
         select_title (MediaItem): The selected media item. Can be None if selection fails.
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     e.g., {'season': season_selection, 'episode': episode_selection}
+    Returns:
+        bool: True if processing was successful, False otherwise
     """
     if not select_title:
         if site_constant.TELEGRAM_BOT:
@@ -86,7 +87,7 @@ def process_search_result(select_title, selections=None):
             bot.send_message("No title selected or selection cancelled.", None)
         else:
             console.print("[yellow]No title selected or selection cancelled.")
-        return
+        return False
 
     if select_title.type == 'tv':
         season_selection = None
@@ -97,9 +98,11 @@ def process_search_result(select_title, selections=None):
             episode_selection = selections.get('episode')
 
         download_series(select_title, season_selection, episode_selection)
+        return True
         
     else:
         download_film(select_title)
+        return True
 
 def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None, selections: dict = None):
     """
@@ -120,14 +123,14 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     if direct_item:
         select_title_obj = MediaItem(**direct_item)
         process_search_result(select_title_obj, selections)
-        return
+        return True
     
     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 not actual_search_query:
         if bot:
-             if actual_search_query is None: # Specifically for timeout from bot.ask or failed restart
+            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
 
@@ -136,16 +139,16 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
 
     # If only the database object (media_search_manager populated by title_search) is needed
     if get_onlyDatabase:
-        return media_search_manager 
+        return media_search_manager
     
     if len_database > 0:
         select_title = get_select_title(table_show_manager, media_search_manager, len_database)
         process_search_result(select_title, selections)
+        return True
     
     else:
-        no_results_message = f"No results found for: '{actual_search_query}'"
         if bot:
-            bot.send_message(no_results_message, None)
+            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}")
         

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -26,6 +26,7 @@ console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
+ssl_verify = config_manager.get_bool("REQUESTS", "verify")
 
 
 def title_search(query: str) -> int:
@@ -49,6 +50,7 @@ def title_search(query: str) -> int:
             f"{site_constant.FULL_URL}/it", 
             headers={'user-agent': get_userAgent()}, 
             timeout=max_timeout,
+            verify=ssl_verify,
 	    follow_redirects=True
         )
         response.raise_for_status()
@@ -75,7 +77,8 @@ def title_search(query: str) -> int:
                 'x-inertia': 'true',
                 'x-inertia-version': version
             },
-            timeout=max_timeout
+            timeout=max_timeout,
+            verify=ssl_verify
         )
         response.raise_for_status()
 

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

@@ -17,6 +17,7 @@ from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
 
 # Variable
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
+ssl_verify = config_manager.get_bool("REQUESTS", "verify")
 
 
 class GetSerieInfo:
@@ -50,7 +51,8 @@ class GetSerieInfo:
             response = httpx.get(
                 url=f"{self.url}/titles/{self.media_id}-{self.series_name}",
                 headers=self.headers,
-                timeout=max_timeout
+                timeout=max_timeout,
+                verify=ssl_verify
             )
             response.raise_for_status()
 
@@ -104,7 +106,8 @@ class GetSerieInfo:
                     'x-inertia': 'true',
                     'x-inertia-version': self.version,
                 },
-                timeout=max_timeout
+                timeout=max_timeout,
+                verify=ssl_verify
             )
 
             # Extract episodes from JSON response

StreamingCommunity/Api/Site/streamingwatch/__init__.py

@@ -1,5 +1,8 @@
 # 29.04.25
 
+import sys
+import subprocess
+
 # External library
 from rich.console import Console
 from rich.prompt import Prompt
@@ -9,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
@@ -32,9 +36,39 @@ def get_user_input(string_to_search: str = None):
     """
     Asks the user to input a search term.
     Handles both Telegram bot input and direct input.
+    If string_to_search is provided, it's returned directly (after stripping).
     """
-    string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
-    return string_to_search
+    if string_to_search is not None:
+        return string_to_search.strip()
+
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+        user_response = bot.ask(
+            "key_search", # Request type
+            "Enter the search term\nor type 'back' to return to the menu: ",
+            None
+        )
+
+        if user_response is None:
+            bot.send_message("Timeout: No search term entered.", None)
+            return None
+
+        if user_response.lower() == 'back':
+            bot.send_message("Returning to the main menu...", None)
+            
+            try:
+                # Restart the script
+                subprocess.Popen([sys.executable] + sys.argv)
+                sys.exit()
+                
+            except Exception as e:
+                bot.send_message(f"Error during restart attempt: {e}", None)
+                return None # Return None if restart fails
+        
+        return user_response.strip()
+        
+    else:
+        return msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
 
 def process_search_result(select_title, selections=None):
     """
@@ -44,7 +78,18 @@ def process_search_result(select_title, selections=None):
         select_title (MediaItem): The selected media item
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
+
+    Returns:
+        bool: True if processing was successful, False otherwise
     """
+    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 False
+    
     if select_title.type == 'tv':
         season_selection = None
         episode_selection = None
@@ -54,9 +99,11 @@ def process_search_result(select_title, selections=None):
             episode_selection = selections.get('episode')
 
         download_series(select_title, season_selection, episode_selection)
+        return True
 
     else:
         download_film(select_title)
+        return True
 
 def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None, selections: dict = None):
     """
@@ -69,26 +116,43 @@ 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
+        return True
     
-    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()
+    # 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 search on the database using the obtained query
-    len_database = title_search(string_to_search)
+    # 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)
+        return True
     
     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/Lib/Downloader/DASH/cdm_helpher.py

@@ -62,6 +62,14 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
 
             if response.status_code != 200:
                 console.print(f"[bold red]License error:[/bold red] {response.status_code}, {response.text}")
+                console.print({
+                    "url": license_url,
+                    "headers": req_headers,
+                    "content": payload,
+                    "session_id": session_id.hex(),
+                    "pssh": pssh
+                })
+                
                 return None
 
             # Handle (JSON) or classic (binary) license response