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

StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -22,6 +22,7 @@ from .site import title_search, table_show_manager, media_search_manager
 from .film import download_film
 from .series import download_series
 
+
 # Variable
 indice = 2
 _useFor = "Film_&_Serie"
@@ -37,25 +38,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).
     """
-    if string_to_search is None:
-        if site_constant.TELEGRAM_BOT:
-            bot = get_bot_instance()
-            string_to_search = bot.ask(
-                "key_search",
-                "Enter the search term\nor type 'back' to return to the menu: ",
-                None
-            )
-
-            if string_to_search == 'back':
+    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()
-        else:
-            string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
-
-    return string_to_search
+                
+            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):
     """
@@ -65,7 +80,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
@@ -75,9 +101,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
 
 # search("Game of Thrones", selections={"season": "1", "episode": "1-3"})
 def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None, selections: dict = None):
@@ -86,39 +114,48 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
 
     Parameters:
         string_to_search (str, optional): String to search for
-        get_onylDatabase (bool, optional): If True, return only the database object
+        get_onlyDatabase (bool, optional): If True, return only the database object
         direct_item (dict, optional): Direct item to process (bypass search)
         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
+
     # Get the user input for the search term
-    string_to_search = get_user_input(string_to_search)
+    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(quote_plus(string_to_search))
+    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 site_constant.TELEGRAM_BOT:
-        bot = get_bot_instance()
-        
+
     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:
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-
-        if site_constant.TELEGRAM_BOT:
-            bot.send_message("No results found, please try again", None)
+        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}")
 
-        # If no results are found, ask again
-        string_to_search = get_user_input()
-        search(string_to_search, get_onlyDatabase, None, selections)
+        # 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/animeunity/__init__.py

@@ -37,25 +37,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).
     """
-    if string_to_search is None:
-        if site_constant.TELEGRAM_BOT:
-            bot = get_bot_instance()
-            string_to_search = bot.ask(
-                "key_search",
-                "Enter the search term\nor type 'back' to return to the menu: ",
-                None
-            )
-
-            if string_to_search == 'back':
+    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()
-        else:
-            string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
-
-    return string_to_search
+                
+            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):
     """
@@ -65,9 +79,21 @@ 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 == 'Movie':
         download_film(select_title)
+        return True
 
     else:
         season_selection = None
@@ -78,6 +104,7 @@ def process_search_result(select_title, selections=None):
             episode_selection = selections.get('episode')
             
         download_series(select_title, season_selection, episode_selection)
+        return True
 
 def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None, selections: dict = None):
     """
@@ -90,34 +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
-
+        return True
+    
     # Get the user input for the search term
-    string_to_search = get_user_input(string_to_search)
+    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(string_to_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 site_constant.TELEGRAM_BOT:
-        bot = get_bot_instance()
 
     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:
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-
-        if site_constant.TELEGRAM_BOT:
-            bot.send_message("No results found, please try again", None)
+        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}")
 
-        # If no results are found, ask again
-        string_to_search = get_user_input()
-        search(string_to_search, get_onlyDatabase, None, selections)
+        # 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/animeworld/__init__.py

@@ -1,5 +1,9 @@
 # 21.03.25
 
+import sys
+import subprocess
+
+
 # External library
 from rich.console import Console
 from rich.prompt import Prompt
@@ -9,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
@@ -28,7 +33,44 @@ msg = Prompt()
 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).
+    """
+    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):
     """
     Handles the search result and initiates the download for either a film or series.
@@ -37,15 +79,28 @@ 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":
         episode_selection = None
         if selections:
             episode_selection = selections.get('episode')
         download_series(select_title, 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):
     """
@@ -58,27 +113,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
+        return True
 
     # Get the user input for the search term
-    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()
+    actual_search_query = get_user_input(string_to_search)
 
     # Perform the database search
-    len_database = title_search(string_to_search)
+    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
+
+    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/crunchyroll/__init__.py

@@ -1,5 +1,7 @@
 # 16.03.25
 
+import sys
+import subprocess
 from urllib.parse import quote_plus
 
 
@@ -12,6 +14,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
@@ -19,6 +22,7 @@ from .site import title_search, table_show_manager, media_search_manager
 from .film import download_film
 from .series import download_series
 
+
 # Variable
 indice = 8
 _useFor = "Anime"
@@ -34,11 +38,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).
     """
-    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()
-
-    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):
     """
@@ -48,7 +80,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
@@ -58,10 +101,12 @@ 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
+    
 # search("Game of Thrones", selections={"season": "1", "episode": "1-3"})
 def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None, selections: dict = None):
     """
@@ -69,33 +114,48 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
 
     Parameters:
         string_to_search (str, optional): String to search for
-        get_onylDatabase (bool, optional): If True, return only the database object
+        get_onlyDatabase (bool, optional): If True, return only the database object
         direct_item (dict, optional): Direct item to process (bypass search)
         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
     
     # Get the user input for the search term
-    string_to_search = get_user_input(string_to_search)
+    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(quote_plus(string_to_search))
+    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)
         process_search_result(select_title, selections)
+        return True
     
     else:
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-
-        # If no results are found, ask again
-        string_to_search = get_user_input()
-        search(string_to_search, get_onlyDatabase, None, selections)
+        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/crunchyroll/site.py

@@ -1,6 +1,7 @@
 # 16.03.25
 
 import os
+import sys
 
 
 # External libraries
@@ -45,7 +46,12 @@ def title_search(query: str) -> int:
     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)
+
+    # 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("[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 = "https://www.crunchyroll.com/content/v2/discover/search"