StreamingCommunity 3.0.6__py3-none-any.whl → 3.0.8__py3-none-any.whl

StreamingCommunity/Api/Site/raiplay/site.py

@@ -1,9 +1,5 @@
 # 21.05.24
 
-import threading
-import queue
-
-
 # External libraries
 import httpx
 from rich.console import Console
@@ -13,12 +9,9 @@ from rich.console import Console
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
-from StreamingCommunity.Lib.TMBD.tmdb import tmdb
-
-
-# Logic class
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
+from .util.ScrapeSerie import GetSerieInfo
 
 
 # Variable
@@ -26,76 +19,33 @@ console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
-MAX_THREADS = 12
 
 
-def determine_media_type(title):
+def determine_media_type(item):
     """
-    Use TMDB to determine if a title is a movie or TV show.
+    Determine if the item is a film or TV series by checking actual seasons count
+    using GetSerieInfo.
     """
     try:
-        # First search as a movie
-        movie_results = tmdb._make_request("search/movie", {"query": title})
-        movie_count = len(movie_results.get("results", []))
-        
-        # Then search as a TV show
-        tv_results = tmdb._make_request("search/tv", {"query": title})
-        tv_count = len(tv_results.get("results", []))
-        
-        # If results found in only one category, use that
-        if movie_count > 0 and tv_count == 0:
+        # Extract program name from path_id
+        program_name = None
+        if item.get('path_id'):
+            parts = item['path_id'].strip('/').split('/')
+            if len(parts) >= 2:
+                program_name = parts[-1].split('.')[0]
+
+        if not program_name:
             return "film"
-        elif tv_count > 0 and movie_count == 0:
-            return "tv"
-        
-        # If both have results, compare popularity
-        if movie_count > 0 and tv_count > 0:
-            top_movie = movie_results["results"][0]
-            top_tv = tv_results["results"][0]
-            
-            return "film" if top_movie.get("popularity", 0) > top_tv.get("popularity", 0) else "tv"
 
-        return "film"
+        scraper = GetSerieInfo(program_name)
+        scraper.collect_info_title()
+        return "tv" if scraper.getNumberSeason() > 0 else "film"
     
     except Exception as e:
-        console.log(f"Error determining media type with TMDB: {e}")
+        console.print(f"[red]Error determining media type: {e}[/red]")
         return "film"
 
 
-def worker_determine_type(work_queue, result_dict, worker_id):
-    """
-    Worker function to process items from queue and determine media types.
-    
-    Parameters:
-        - work_queue: Queue containing items to process
-        - result_dict: Dictionary to store results
-        - worker_id: ID of the worker thread
-    """
-    while not work_queue.empty():
-        try:
-            index, item = work_queue.get(block=False)
-            title = item.get('titolo', '')
-            media_type = determine_media_type(title)
-            
-            result_dict[index] = {
-                'id': item.get('id', ''),
-                'name': title,
-                'type': media_type,
-                'path_id': item.get('path_id', ''),
-                'url': f"https://www.raiplay.it{item.get('url', '')}",
-                'image': f"https://www.raiplay.it{item.get('immagine', '')}",
-            }
-            
-            work_queue.task_done()
-
-        except queue.Empty:
-            break
-
-        except Exception as e:
-            console.log(f"Worker {worker_id} error: {e}")
-            work_queue.task_done()
-
-
 def title_search(query: str) -> int:
     """
     Search for titles based on a search query.
@@ -141,33 +91,15 @@ def title_search(query: str) -> int:
     data = response.json().get('agg').get('titoli').get('cards')
     data = data[:15] if len(data) > 15 else data
     
-    # Use multithreading to determine media types in parallel
-    work_queue = queue.Queue()
-    result_dict = {}
-    
-    # Add items to the work queue
-    for i, item in enumerate(data):
-        work_queue.put((i, item))
-    
-    # Create and start worker threads
-    threads = []
-    for i in range(min(MAX_THREADS, len(data))):
-        thread = threading.Thread(
-            target=worker_determine_type,
-            args=(work_queue, result_dict, i),
-            daemon=True
-        )
-        threads.append(thread)
-        thread.start()
-    
-    # Wait for all threads to complete
-    for thread in threads:
-        thread.join()
-    
-    # Add all results to media manager in correct order
-    for i in range(len(data)):
-        if i in result_dict:
-            media_search_manager.add_media(result_dict[i])
+    # Process each item and add to media manager
+    for item in data:
+        media_search_manager.add_media({
+            'id': item.get('id', ''),
+            'name': item.get('titolo', ''),
+            'type': determine_media_type(item),
+            'path_id': item.get('path_id', ''),
+            'url': f"https://www.raiplay.it{item.get('url', '')}",
+            'image': f"https://www.raiplay.it{item.get('immagine', '')}",
+        })
           
-    # Return the number of titles found
     return media_search_manager.get_length()

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

@@ -30,28 +30,48 @@ class GetSerieInfo:
         try:
             program_url = f"{self.base_url}/programmi/{self.program_name}.json"
             response = httpx.get(url=program_url, headers=get_headers(), timeout=max_timeout)
+            
+            # If 404, content is not yet available
+            if response.status_code == 404:
+                logging.info(f"Content not yet available: {self.program_name}")
+                return
+                
             response.raise_for_status()
-
             json_data = response.json()
             
             # Look for seasons in the 'blocks' property
-            for block in json_data.get('blocks'):
-                if block.get('type') == 'RaiPlay Multimedia Block' and block.get('name', '').lower() == 'episodi':
-                    self.publishing_block_id = block.get('id')
-                    
-                    # Extract seasons from sets array
-                    for season_set in block.get('sets', []):
-                        if 'stagione' in season_set.get('name', '').lower():
-                            self.seasons_manager.add_season({
-                                'id': season_set.get('id', ''),
-                                'number': len(self.seasons_manager.seasons) + 1,
-                                'name': season_set.get('name', ''),
-                                'path': season_set.get('path_id', ''),
-                                'episodes_count': season_set.get('episode_size', {}).get('number', 0)
-                            })
-
-        except Exception as e:
+            for block in json_data.get('blocks', []):
+
+                # Check if block is a season block or episodi block
+                if block.get('type') == 'RaiPlay Multimedia Block':
+                    if block.get('name', '').lower() == 'episodi':
+                        self.publishing_block_id = block.get('id')
+
+                        # Extract seasons from sets array
+                        for season_set in block.get('sets', []):
+                            if 'stagione' in season_set.get('name', '').lower():
+                                self._add_season(season_set, block.get('id'))
+                                
+                    elif 'stagione' in block.get('name', '').lower():
+                        self.publishing_block_id = block.get('id')
+
+                        # Extract season directly from block's sets
+                        for season_set in block.get('sets', []):
+                            self._add_season(season_set, block.get('id'))
+
+        except httpx.HTTPError as e:
             logging.error(f"Error collecting series info: {e}")
+        except Exception as e:
+            logging.error(f"Unexpected error collecting series info: {e}")
+
+    def _add_season(self, season_set: dict, block_id: str):
+        self.seasons_manager.add_season({
+            'id': season_set.get('id', ''),
+            'number': len(self.seasons_manager.seasons) + 1,
+            'name': season_set.get('name', ''),
+            'path': season_set.get('path_id', ''),
+            'episodes_count': season_set.get('episode_size', {}).get('number', 0)
+        })
 
     def collect_info_season(self, number_season: int) -> None:
         """Get episodes for a specific season."""

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,56 +100,67 @@ 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()
+
+    # Check proxy if not already set
+    finder = ProxyFinder(site_constant.FULL_URL)
+    proxy = finder.find_fast_proxy()
+    
     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
+    
 
-    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':
+    actual_search_query = get_user_input(string_to_search)
 
-                # 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()
+    # 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(actual_search_query, 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(f"{site_constant.FULL_URL}/it", 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(f"{site_constant.FULL_URL}/it", True, select_season.id)
-    scrape_serie = GetSerieInfo(f"{site_constant.FULL_URL}/it", 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.
       
@@ -48,7 +48,8 @@ def title_search(query: str) -> int:
         response = httpx.get(
             f"{site_constant.FULL_URL}/it", 
             headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout
+            timeout=max_timeout,
+            proxy=proxy
         )
         response.raise_for_status()
 
@@ -56,6 +57,7 @@ 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
 
@@ -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

@@ -21,12 +21,13 @@ from .series import download_series
 # Variable
 indice = 7
 _useFor = "Film_&_Serie"
-_priority = 10          # !!! MOLTO LENTO
+_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