StreamingCommunity 3.0.5__py3-none-any.whl → 3.0.7__py3-none-any.whl

StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -12,6 +12,7 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Api.Template import get_select_title
+from StreamingCommunity.Lib.Proxies.proxy import ProxyFinder
 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
@@ -25,48 +26,72 @@ from .series import download_series
 
 # Variable
 indice = 0
-_useFor = "film_serie"
+_useFor = "Film_&_Serie" # "Movies_&_Series"
 _priority = 0
 _engineDownload = "hls"
 _deprecate = False
 
 msg = Prompt()
 console = Console()
+proxy = None
 
 
 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",
-                f"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):
+def process_search_result(select_title, selections=None, proxy=None):
     """
     Handles the search result and initiates the download for either a film or series.
     
     Parameters:
-        select_title (MediaItem): The selected media item
+        select_title (MediaItem): The selected media item. Can be None if selection fails.
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
-                                    {'season': season_selection, 'episode': episode_selection}
+                                    e.g., {'season': season_selection, 'episode': episode_selection}
+        proxy (str, optional): The proxy to use for downloads.
     """
+    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
@@ -75,42 +100,65 @@ def process_search_result(select_title, selections=None):
             season_selection = selections.get('season')
             episode_selection = selections.get('episode')
 
-        download_series(select_title, season_selection, episode_selection)
-
+        download_series(select_title, season_selection, episode_selection, proxy)
+        
     else:
-        download_film(select_title)
+        download_film(select_title, proxy)
 
 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)
+        string_to_search (str, optional): String to search for. Can be passed from run.py.
+                                          If 'back', special handling might occur in get_user_input.
+        get_onlyDatabase (bool, optional): If True, return only the database search manager object.
+        direct_item (dict, optional): Direct item to process (bypasses search).
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
-                                    {'season': season_selection, 'episode': episode_selection}
+                                     for series (season/episode).
     """
+    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)
+        select_title_obj = MediaItem(**direct_item)
+        process_search_result(select_title_obj, selections, proxy)
         return
+    
+    # Check proxy if not already set
+    finder = ProxyFinder(site_constant.FULL_URL)
+    proxy = finder.find_fast_proxy()
+
+    actual_search_query = get_user_input(string_to_search)
 
-    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()
+    # 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
 
-    # Search on database
-    len_database = title_search(string_to_search)
+    # Perform search on the database using the obtained query
+    finder = ProxyFinder(site_constant.FULL_URL)
+    proxy = finder.find_fast_proxy()
+    len_database = title_search(string_to_search, proxy)
 
-    # If only the database is needed, return the manager
+    # 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)
-        process_search_result(select_title, selections)
+        select_title = get_select_title(table_show_manager, media_search_manager, len_database)
+        process_search_result(select_title, selections, proxy)
     
     else:
-        # If no results are found, ask again
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-        search()
+        no_results_message = f"No results found for: '{actual_search_query}'"
+        if bot:
+            bot.send_message(no_results_message, 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/streamingcommunity/film.py

@@ -27,7 +27,7 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSource
 console = Console()
 
 
-def download_film(select_title: MediaItem) -> str:
+def download_film(select_title: MediaItem, proxy: str = None) -> str:
     """
     Downloads a film using the provided film ID, title name, and domain.
 
@@ -55,7 +55,7 @@ def download_film(select_title: MediaItem) -> str:
     console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
     # Init class
-    video_source = VideoSource(site_constant.FULL_URL, False, select_title.id)
+    video_source = VideoSource(f"{site_constant.FULL_URL}/it", False, select_title.id, proxy)
 
     # Retrieve scws and if available master playlist
     video_source.get_iframe(select_title.id)

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -142,7 +142,7 @@ def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, vid
                 break
 
 
-def download_series(select_season: MediaItem, season_selection: str = None, episode_selection: str = None) -> None:
+def download_series(select_season: MediaItem, season_selection: str = None, episode_selection: str = None, proxy = None) -> None:
     """
     Handle downloading a complete series.
 
@@ -154,8 +154,8 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     start_message()
 
     # Init class
-    video_source = VideoSource(site_constant.FULL_URL, True, select_season.id)
-    scrape_serie = GetSerieInfo(site_constant.FULL_URL, select_season.id, select_season.slug)
+    video_source = VideoSource(f"{site_constant.FULL_URL}/it", True, select_season.id, proxy)
+    scrape_serie = GetSerieInfo(f"{site_constant.FULL_URL}/it", select_season.id, select_season.slug, proxy)
 
     # Collect information about season
     scrape_serie.getNumberSeason()
@@ -219,4 +219,4 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         # Get script_id
         script_id = TelegramSession.get_session()
         if script_id != "unknown":
-            TelegramSession.deleteScriptId(script_id)
+            TelegramSession.deleteScriptId(script_id)

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -28,7 +28,7 @@ table_show_manager = TVShowManager()
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
-def title_search(query: str) -> int:
+def title_search(query: str, proxy: str) -> int:
     """
     Search for titles based on a search query.
       
@@ -46,9 +46,10 @@ def title_search(query: str) -> int:
 
     try:
         response = httpx.get(
-            site_constant.FULL_URL, 
+            f"{site_constant.FULL_URL}/it", 
             headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout
+            timeout=max_timeout,
+            proxy=proxy
         )
         response.raise_for_status()
 
@@ -56,10 +57,11 @@ def title_search(query: str) -> int:
         version = json.loads(soup.find('div', {'id': "app"}).get("data-page"))['version']
 
     except Exception as e:
+        if "WinError" in str(e) or "Errno" in str(e): console.print("\n[bold yellow]Please make sure you have enabled and configured a valid proxy.[/bold yellow]")
         console.print(f"[red]Site: {site_constant.SITE_NAME} version, request error: {e}")
         return 0
 
-    search_url = f"{site_constant.FULL_URL}/search?q={query}"
+    search_url = f"{site_constant.FULL_URL}/it/search?q={query}"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
@@ -71,7 +73,8 @@ def title_search(query: str) -> int:
                 'x-inertia': 'true',
                 'x-inertia-version': version
             },
-            timeout=max_timeout
+            timeout=max_timeout,
+            proxy=proxy
         )
         response.raise_for_status()
 
@@ -117,4 +120,4 @@ def title_search(query: str) -> int:
             bot.send_message(f"Lista dei risultati:", choices)
           
     # Return the number of titles found
-    return media_search_manager.get_length()
+    return media_search_manager.get_length()

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

@@ -20,7 +20,7 @@ max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 class GetSerieInfo:
-    def __init__(self, url, media_id: int = None, series_name: str = None):
+    def __init__(self, url, media_id: int = None, series_name: str = None, proxy = None):
         """
         Initialize the GetSerieInfo class for scraping TV series information.
         
@@ -32,6 +32,7 @@ class GetSerieInfo:
         self.is_series = False
         self.headers = {'user-agent': get_userAgent()}
         self.url = url
+        self.proxy = proxy
         self.media_id = media_id
         self.seasons_manager = SeasonManager()
 
@@ -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,
+                proxy=self.proxy
             )
             response.raise_for_status()
 
@@ -104,7 +106,8 @@ class GetSerieInfo:
                     'x-inertia': 'true',
                     'x-inertia-version': self.version,
                 },
-                timeout=max_timeout
+                timeout=max_timeout,
+                proxy=self.proxy
             )
 
             # Extract episodes from JSON response

StreamingCommunity/Api/Site/streamingwatch/__init__.py

@@ -19,14 +19,15 @@ from .series import download_series
 
 
 # Variable
-indice = 8
-_useFor = "film_serie"
-_priority = 10          # !!! MOLTO LENTO
+indice = 7
+_useFor = "Film_&_Serie"
+_priority = 0
 _engineDownload = "hls"
 _deprecate = False
 
 msg = Prompt()
 console = Console()
+proxy = None
 
 
 def get_user_input(string_to_search: str = None):
@@ -74,20 +75,25 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
         select_title = MediaItem(**direct_item)
         process_search_result(select_title, selections) # DONT SUPPORT PROXY FOR NOW
         return
+    
+    # Check proxy if not already set
+    finder = ProxyFinder(site_constant.FULL_URL)
+    proxy = finder.find_fast_proxy()
 
     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()
     
+    # Perform search on the database using the obtained query
     finder = ProxyFinder(url=f"{site_constant.FULL_URL}/serie/euphoria/")
-    proxy, response_serie, _ = finder.find_fast_proxy()
-    len_database = title_search(string_to_search, [proxy, response_serie])
+    proxy = finder.find_fast_proxy()
+    len_database = title_search(string_to_search, proxy)
 
     # 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)
+        select_title = get_select_title(table_show_manager, media_search_manager,len_database)
         process_search_result(select_title, selections, proxy)
     
     else:

StreamingCommunity/Api/Site/streamingwatch/site.py

@@ -27,9 +27,16 @@ table_show_manager = TVShowManager()
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
-def extract_nonce(response_) -> str:
+def extract_nonce(proxy) -> str:
     """Extract nonce value from the page script"""
-    soup = BeautifulSoup(response_.content, 'html.parser')
+    response = httpx.get(
+        site_constant.FULL_URL, 
+        headers={'user-agent': get_userAgent()}, 
+        timeout=max_timeout,
+        proxy=proxy
+    )
+    
+    soup = BeautifulSoup(response.content, 'html.parser')
     script = soup.find('script', id='live-search-js-extra')
     if script:
         match = re.search(r'"admin_ajax_nonce":"([^"]+)"', script.text)
@@ -38,7 +45,7 @@ def extract_nonce(response_) -> str:
     return ""
 
 
-def title_search(query: str, additionalData: list) -> int:
+def title_search(query: str, proxy: str) -> int:
     """
     Search for titles based on a search query.
       
@@ -51,12 +58,11 @@ def title_search(query: str, additionalData: list) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    proxy, response_serie = additionalData
     search_url = f"{site_constant.FULL_URL}/wp-admin/admin-ajax.php"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        _wpnonce = extract_nonce(response_serie)
+        _wpnonce = extract_nonce(proxy)
         
         if not _wpnonce:
             console.print("[red]Error: Failed to extract nonce")
@@ -82,6 +88,7 @@ def title_search(query: str, additionalData: list) -> int:
         soup = BeautifulSoup(response.text, 'html.parser')
 
     except Exception as e:
+        if "WinError" in str(e) or "Errno" in str(e): console.print("\n[bold yellow]Please make sure you have enabled and configured a valid proxy.[/bold yellow]")
         console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
         return 0
 

StreamingCommunity/Api/Template/site.py

@@ -7,78 +7,123 @@ import sys
 from rich.console import Console
 
 
+# Internal utilities
+from StreamingCommunity.Api.Template.config_loader import site_constant
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
+
 # Variable
 console = Console()
 available_colors = ['red', 'magenta', 'yellow', 'cyan', 'green', 'blue', 'white']
 column_to_hide = ['Slug', 'Sub_ita', 'Last_air_date', 'Seasons_count', 'Url', 'Image', 'Path_id']
 
 
-def get_select_title(table_show_manager, media_search_manager):
+def get_select_title(table_show_manager, media_search_manager, num_results_available): 
     """
     Display a selection of titles and prompt the user to choose one.
+    Handles both console and Telegram bot input.
+
+    Parameters:
+        table_show_manager: Manager for console table display.
+        media_search_manager: Manager holding the list of media items.
+        num_results_available (int): The number of media items available for selection.
 
     Returns:
-        MediaItem: The selected media item.
+        MediaItem: The selected media item, or None if no selection is made or an error occurs.
     """
-    # Determine column_info dynamically for (search site)
     if not media_search_manager.media_list:
-        console.print("\n[red]No media items available.")
+        
+        # console.print("\n[red]No media items available.")
         return None
-    
-    # Example of available colors for columns
-    available_colors = ['red', 'magenta', 'yellow', 'cyan', 'green', 'blue', 'white']
-    
-    # Retrieve the keys of the first media item as column headers
-    first_media_item = media_search_manager.media_list[0]
-    column_info = {"Index": {'color': available_colors[0]}}  # Always include Index with a fixed color
-
-    # Assign colors to the remaining keys dynamically
-    color_index = 1
-    for key in first_media_item.__dict__.keys():
-
-        if key.capitalize() in column_to_hide:
-            continue
-
-        if key in ('id', 'type', 'name', 'score'):  # Custom prioritization of colors
-            if key == 'type':
-                column_info["Type"] = {'color': 'yellow'}
-            elif key == 'name':
-                column_info["Name"] = {'color': 'magenta'}
-            elif key == 'score':
-                column_info["Score"] = {'color': 'cyan'}
-
-        else:
-            column_info[key.capitalize()] = {'color': available_colors[color_index % len(available_colors)]}
-            color_index += 1
-
-    table_show_manager.add_column(column_info)
-
-    # Populate the table with title information
-    for i, media in enumerate(media_search_manager.media_list):
-        media_dict = {'Index': str(i)}
 
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+        prompt_message = f"Inserisci il numero del titolo che vuoi selezionare (da 0 a {num_results_available - 1}):"
+        
+        user_input_str = bot.ask(
+            "select_title_from_list_number",
+            prompt_message,
+            None
+        )
+
+        if user_input_str is None: 
+            bot.send_message("Timeout: nessuna selezione ricevuta.", None)
+            return None
+
+        try:
+            chosen_index = int(user_input_str)
+            if 0 <= chosen_index < num_results_available:
+                selected_item = media_search_manager.get(chosen_index)
+                if selected_item:
+                    return selected_item
+                    
+                else:
+                    bot.send_message(f"Errore interno: Impossibile recuperare il titolo con indice {chosen_index}.", None)
+                    return None
+            else:
+                bot.send_message(f"Selezione '{chosen_index}' non valida. Inserisci un numero compreso tra 0 e {num_results_available - 1}.", None)
+                return None
+                
+        except ValueError:
+            bot.send_message(f"Input '{user_input_str}' non valido. Devi inserire un numero.", None)
+            return None
+            
+        except Exception as e:
+            bot.send_message(f"Si è verificato un errore durante la selezione: {e}", None)
+            return None
+
+    else:
+        
+        # Logica originale per la console
+        if not media_search_manager.media_list:
+            console.print("\n[red]No media items available.")
+            return None
+        
+        first_media_item = media_search_manager.media_list[0]
+        column_info = {"Index": {'color': available_colors[0]}}
+
+        color_index = 1
         for key in first_media_item.__dict__.keys():
             if key.capitalize() in column_to_hide:
                 continue
-
-            # Ensure all values are strings for rich add table
-            media_dict[key.capitalize()] = str(getattr(media, key))
-
-        table_show_manager.add_tv_show(media_dict)
-
-    # Run the table and handle user input
-    last_command = table_show_manager.run(force_int_input=True, max_int_input=len(media_search_manager.media_list))
-    table_show_manager.clear()
-
-    # Handle user's quit command
-    if last_command == "q" or last_command == "quit":
-        console.print("\n[red]Quit ...")
-        sys.exit(0)
-
-    # Check if the selected index is within range
-    if 0 <= int(last_command) < len(media_search_manager.media_list):
-        return media_search_manager.get(int(last_command))
-    
-    else:
-        console.print("\n[red]Wrong index")
-        sys.exit(0)
+            if key in ('id', 'type', 'name', 'score'):
+                if key == 'type': column_info["Type"] = {'color': 'yellow'}
+                elif key == 'name': column_info["Name"] = {'color': 'magenta'}
+                elif key == 'score': column_info["Score"] = {'color': 'cyan'}
+            else:
+                column_info[key.capitalize()] = {'color': available_colors[color_index % len(available_colors)]}
+                color_index += 1
+
+        table_show_manager.clear() 
+        table_show_manager.add_column(column_info)
+
+        for i, media in enumerate(media_search_manager.media_list):
+            media_dict = {'Index': str(i)}
+            for key in first_media_item.__dict__.keys():
+                if key.capitalize() in column_to_hide:
+                    continue
+                media_dict[key.capitalize()] = str(getattr(media, key))
+            table_show_manager.add_tv_show(media_dict)
+
+        last_command_str = table_show_manager.run(force_int_input=True, max_int_input=len(media_search_manager.media_list))
+        table_show_manager.clear()
+
+        if last_command_str is None or last_command_str.lower() in ["q", "quit"]: 
+            console.print("\n[red]Selezione annullata o uscita.")
+            return None 
+
+        try:
+           
+            selected_index = int(last_command_str)
+            
+            if 0 <= selected_index < len(media_search_manager.media_list):
+                return media_search_manager.get(selected_index)
+                
+            else:
+                console.print("\n[red]Indice errato o non valido.")
+                # sys.exit(0)
+                return None
+                
+        except ValueError:
+            console.print("\n[red]Input non numerico ricevuto dalla tabella.")
+            # sys.exit(0)
+            return None