StreamingCommunity 3.3.0__tar.gz → 3.3.1__tar.gz

{streamingcommunity-3.3.0/StreamingCommunity.egg-info → streamingcommunity-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.3.0
+Version: 3.3.1
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -25,6 +25,7 @@ Requires-Dist: ua-generator
 Requires-Dist: qbittorrent-api
 Requires-Dist: pyTelegramBotAPI
 Requires-Dist: pywidevine
+Requires-Dist: seleniumbase
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
@@ -906,10 +907,6 @@ python3 telegram_bot.py
 ```
 </details>
 
-# SITE_LOGIN key  
-To use some site, you may need a SITE_LOGIN key.  
-See [guide.md](.github/.site/guide.md) for instructions on how to obtain it.
-
 # Tutorials
 
 - [Windows](https://www.youtube.com/watch?v=mZGqK4wdN-k)
@@ -917,17 +914,11 @@ See [guide.md](.github/.site/guide.md) for instructions on how to obtain it.
 - [Pypy](https://www.youtube.com/watch?v=C6m9ZKOK0p4)
 - [Compiled](https://www.youtube.com/watch?v=pm4lqsxkTVo)
 
-# To Do
-
-- To Finish [website API](https://github.com/Arrowar/StreamingCommunity/tree/test_gui_1)
-- To finish [website API 2](https://github.com/hydrosh/StreamingCommunity/tree/test_gui_1)
-
 ## Useful Project
 
 ### 🎯 [Unit3Dup](https://github.com/31December99/Unit3Dup)
 Bot in Python per la generazione e l'upload automatico di torrent su tracker basati su Unit3D.
 
-
 ### 🇮🇹 [MammaMia](https://github.com/UrloMythus/MammaMia)
 Addon per Stremio che consente lo streaming HTTPS di film, serie, anime e TV in diretta in lingua italiana.
 

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/README.md

@@ -869,10 +869,6 @@ python3 telegram_bot.py
 ```
 </details>
 
-# SITE_LOGIN key  
-To use some site, you may need a SITE_LOGIN key.  
-See [guide.md](.github/.site/guide.md) for instructions on how to obtain it.
-
 # Tutorials
 
 - [Windows](https://www.youtube.com/watch?v=mZGqK4wdN-k)
@@ -880,17 +876,11 @@ See [guide.md](.github/.site/guide.md) for instructions on how to obtain it.
 - [Pypy](https://www.youtube.com/watch?v=C6m9ZKOK0p4)
 - [Compiled](https://www.youtube.com/watch?v=pm4lqsxkTVo)
 
-# To Do
-
-- To Finish [website API](https://github.com/Arrowar/StreamingCommunity/tree/test_gui_1)
-- To finish [website API 2](https://github.com/hydrosh/StreamingCommunity/tree/test_gui_1)
-
 ## Useful Project
 
 ### 🎯 [Unit3Dup](https://github.com/31December99/Unit3Dup)
 Bot in Python per la generazione e l'upload automatico di torrent su tracker basati su Unit3D.
 
-
 ### 🇮🇹 [MammaMia](https://github.com/UrloMythus/MammaMia)
 Addon per Stremio che consente lo streaming HTTPS di film, serie, anime e TV in diretta in lingua italiana.
 
@@ -901,4 +891,4 @@ API non ufficiale per accedere ai contenuti del sito italiano StreamingCommunity
 
 This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software.
 
-> **Note:** DASH downloads require a valid L3 CDM (Content Decryption Module) to proceed. This project does not provide, include, or facilitate obtaining any CDM. Users are responsible for ensuring compliance with all applicable laws and requirements regarding DRM and decryption modules.
+> **Note:** DASH downloads require a valid L3 CDM (Content Decryption Module) to proceed. This project does not provide, include, or facilitate obtaining any CDM. Users are responsible for ensuring compliance with all applicable laws and requirements regarding DRM and decryption modules.

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -38,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):
     """
@@ -66,6 +80,9 @@ 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:
@@ -73,7 +90,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
@@ -84,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):
@@ -107,8 +126,8 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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
     actual_search_query = get_user_input(string_to_search)
 
@@ -129,6 +148,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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:
         if bot:

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/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,6 +79,9 @@ 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:
@@ -72,10 +89,11 @@ 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 == 'Movie':
         download_film(select_title)
+        return True
 
     else:
         season_selection = None
@@ -86,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):
     """
@@ -105,7 +124,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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
     actual_search_query = get_user_input(string_to_search)
@@ -127,6 +146,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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:
         if bot:

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/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
@@ -29,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.
@@ -38,6 +79,9 @@ 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:
@@ -45,16 +89,18 @@ 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":
         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):
     """
@@ -74,13 +120,10 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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:
-        actual_search_query = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
-    else:
-        actual_search_query = string_to_search
+    actual_search_query = get_user_input(string_to_search)
 
     # Perform the database search
     if not actual_search_query:
@@ -98,6 +141,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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:
         if bot:

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/StreamingCommunity/Api/Site/crunchyroll/__init__.py

@@ -1,5 +1,7 @@
 # 16.03.25
 
+import sys
+import subprocess
 from urllib.parse import quote_plus
 
 
@@ -36,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()
+    if string_to_search is not None:
+        return string_to_search.strip()
 
-    return string_to_search
+    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):
     """
@@ -50,6 +80,9 @@ 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:
@@ -57,7 +90,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
@@ -68,25 +101,17 @@ 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):
     """
     Main function of the application for search.
 
-    Parameters:
-        string_to_search (str, optional): String to search for
-        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}
-    """
-    """
-    Main function of the application for search.
-
     Parameters:
         string_to_search (str, optional): String to search for
         get_onlyDatabase (bool, optional): If True, return only the database object
@@ -101,7 +126,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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
     actual_search_query = get_user_input(string_to_search)
@@ -123,6 +148,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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:
         if bot:

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -50,7 +50,7 @@ def title_search(query: str) -> int:
 
     # 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]")
+        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

{streamingcommunity-3.3.0 → streamingcommunity-3.3.1}/StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -1,5 +1,7 @@
 # 09.06.24
 
+import sys
+import subprocess
 from urllib.parse import quote_plus
 
 
@@ -31,6 +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.
@@ -39,6 +79,9 @@ 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:
@@ -46,7 +89,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
     
     season_selection = None
     episode_selection = None
@@ -56,6 +99,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):
     """
@@ -79,12 +123,10 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     if direct_item:
         select_title = MediaItem(**direct_item)
         process_search_result(select_title, selections)
-        return
+        return True
 
-    if string_to_search is None:
-        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
+    # Get the user input for the search term
+    actual_search_query = get_user_input(string_to_search)
 
     # Handle empty input
     if not actual_search_query:
@@ -103,6 +145,8 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     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:
         if bot:
             bot.send_message(f"No results found for: '{actual_search_query}'", None)