StreamingCommunity 2.9.4__py3-none-any.whl → 2.9.5__py3-none-any.whl

StreamingCommunity/Api/Site/cb01new/site.py

@@ -40,7 +40,7 @@ def title_search(word_to_search: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    search_url = f"{site_constant.FULL_URL}/?story={word_to_search}&do=search&subaction=search"
+    search_url = f"{site_constant.FULL_URL}/?s={word_to_search}"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
@@ -54,14 +54,16 @@ def title_search(word_to_search: str) -> int:
     # Create soup and find table
     soup = BeautifulSoup(response.text, "html.parser")
 
-    for div in soup.find_all("div", class_ = "short-main"):
+    for card in soup.find_all("div", class_=["card", "mp-post", "horizontal"]):
         try:
-            url = div.find("a").get("href")
-            title = div.find("a").get_text(strip=True)
+            title_tag = card.find("h3", class_="card-title").find("a")
+            url = title_tag.get("href")
+            title = title_tag.get_text(strip=True)
 
             title_info = {
                 'name': title,
-                'url': url
+                'url': url,
+                'type': 'film'
             }
 
             media_search_manager.add_media(title_info)

StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py

@@ -12,6 +12,7 @@ from rich.prompt import Prompt
 # Internal utilities
 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
 
 
 # Logic class
@@ -30,10 +31,28 @@ msg = Prompt()
 console = Console()
 
 
-def search(string_to_search: str = None, get_onylDatabase: bool = False):
+def process_search_result(select_title):
     """
-    Main function of the application for film and series.
+    Handles the search result and initiates the download for either a film or series.
     """
+    if "Serie TV" in str(select_title.type):
+        download_thread(select_title)
+    else:
+        logging.error(f"Not supported: {select_title.type}")
+
+def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None):
+    """
+    Main function of the application for search film, series and anime.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onylDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
+    """
+    if direct_item:
+        select_title = MediaItem(**direct_item)
+        process_search_result(select_title)
+        return
 
     if string_to_search is None:
         string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
@@ -41,24 +60,16 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     # Search on database
     len_database = title_search(quote_plus(string_to_search))
 
-    # Return list of elements
-    if get_onylDatabase:
+    # If only the database is needed, return the manager
+    if get_onlyDatabase:
         return media_search_manager
 
     if len_database > 0:
-
-        # Select title from list
         select_title = get_select_title(table_show_manager, media_search_manager)
-
-        # Download only film
-        if "Serie TV" in str(select_title.type):
-            download_thread(select_title)
-
-        else:
-            logging.error(f"Not supported: {select_title.type}")
+        process_search_result(select_title)
 
     else:
+        
+        # If no results are found, ask again
         console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-
-        # Retry
         search()

StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -11,6 +11,7 @@ from rich.prompt import Prompt
 # Internal utilities
 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
 
 
 # Logic class
@@ -29,10 +30,25 @@ msg = Prompt()
 console = Console()
 
 
-def search(string_to_search: str = None, get_onylDatabase: bool = False):
+def process_search_result(select_title):
     """
-    Main function of the application for film and series.
+    Handles the search result and initiates the download for either a film or series.
     """
+    download_series(select_title)
+
+def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None):
+    """
+    Main function of the application for search film, series and anime.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onylDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
+    """
+    if direct_item:
+        select_title = MediaItem(**direct_item)
+        process_search_result(select_title)
+        return
 
     if string_to_search is None:
         string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
@@ -40,20 +56,16 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     # Search on database
     len_database = title_search(quote_plus(string_to_search))
 
-    # Return list of elements
-    if get_onylDatabase:
+    # If only the database is needed, return the manager
+    if get_onlyDatabase:
         return media_search_manager
 
     if len_database > 0:
-
-        # Select title from list
         select_title = get_select_title(table_show_manager, media_search_manager)
-
-        # Download only film
-        download_series(select_title)
+        process_search_result(select_title)
 
     else:
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
 
-        # Retry
+        # If no results are found, ask again
+        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
         search()

StreamingCommunity/Api/Site/guardaserie/site.py

@@ -63,7 +63,8 @@ def title_search(word_to_search: str) -> int:
 
             serie_info = {
                 'name': title,
-                'url': link
+                'url': link,
+                'type': 'tv'
             }
 
             media_search_manager.add_media(serie_info)

StreamingCommunity/Api/Site/mostraguarda/__init__.py

@@ -5,12 +5,16 @@ from urllib.parse import quote_plus
 
 # External library
 from rich.console import Console
-from rich.prompt import Prompt, Confirm
+from rich.prompt import Prompt
 
 
-# Logic class
+# Internal utilities
 from StreamingCommunity.Api.Template.config_loader import site_constant
+from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 from StreamingCommunity.Lib.TMBD import tmdb, Json_film
+
+
+# Logic class
 from .film import download_film
 
 
@@ -25,16 +29,32 @@ msg = Prompt()
 console = Console()
 
 
-def search(string_to_search: str = None, get_onylDatabase: bool = False):
+def process_search_result(select_title):
     """
-    Main function of the application for film and series.
+    Handles the search result and initiates the download for either a film or series.
     """
+    download_film(select_title)
+
+
+def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None):
+    """
+    Main function of the application for search film, series and anime.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onylDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
+    """
+    if direct_item:
+        select_title = MediaItem(**direct_item)
+        process_search_result(select_title)
+        return
 
     if string_to_search is None:
         string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
 
     # Not available for the moment
-    if get_onylDatabase:
+    if get_onlyDatabase:
         return 0
 
     # Search on database
@@ -47,7 +67,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
         download_film(movie_details)
 
     else:
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
 
-        # Retry
+        # If no results are found, ask again
+        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
         search()

StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -12,11 +12,12 @@ from rich.prompt import Prompt
 
 # Internal utilities
 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
-from StreamingCommunity.Api.Template.config_loader import site_constant
 from .site import title_search, table_show_manager, media_search_manager
 from .film import download_film
 from .series import download_series
@@ -33,54 +34,76 @@ msg = Prompt()
 console = Console()
 
 
-def search(string_to_search: str = None, get_onylDatabase: bool = False):
+def get_user_input(string_to_search: str = None):
     """
-    Main function of the application for film and series.
+    Asks the user to input a search term.
+    Handles both Telegram bot input and direct input.
     """
-    if site_constant.TELEGRAM_BOT:
-        bot = get_bot_instance()
-
-        if string_to_search is None:
-            
-            # Chiedi la scelta all'utente con il bot Telegram
+    if string_to_search is None:
+        if site_constant.TELEGRAM_BOT:
+            bot = get_bot_instance()
             string_to_search = bot.ask(
                 "key_search",
-                f"Inserisci la parola da cercare\noppure back per tornare alla scelta: ",
+                f"Enter the search term\nor type 'back' to return to the menu: ",
                 None
             )
 
             if string_to_search == 'back':
-                # Riavvia lo script
-                # Chiude il processo attuale e avvia una nuova istanza dello script
+
+                # 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
+
+def process_search_result(select_title):
+    """
+    Handles the search result and initiates the download for either a film or series.
+    """
+    if select_title.type == 'tv':
+        download_series(select_title)
     else:
-        if string_to_search is None:
-            string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
+        download_film(select_title)
 
+def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None):
+    """
+    Main function of the application for search film, series and anime.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onylDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
+    """
+    if direct_item:
+        select_title = MediaItem(**direct_item)
+        process_search_result(select_title)
+        return
+    
+    # Get the user input for the search term
+    string_to_search = get_user_input(string_to_search)
+    
+    # Perform the database search
     len_database = title_search(quote_plus(string_to_search))
 
-    # Return list of elements
-    if get_onylDatabase:
+    # 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 from list
         select_title = get_select_title(table_show_manager, media_search_manager)
-        
-        if select_title.type == 'tv':
-            download_series(select_title)
-        
-        else:
-            download_film(select_title)
+        process_search_result(select_title)
     
     else:
         console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
 
         if site_constant.TELEGRAM_BOT:
-            bot.send_message(f"Nessun risultato trovato riprova", None)
+            bot.send_message(f"No results found, please try again", None)
 
-        # Retry
+        # If no results are found, ask again
+        string_to_search = get_user_input()
         search()

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -185,7 +185,11 @@ def download_series(select_season: MediaItem) -> None:
 
         index_season_selected = bot.ask(
             "select_title_episode",
-            "Inserisci il numero della stagione (es. 1), * per scaricare tutte le stagioni, (es. 1-2) per un intervallo di stagioni, o (es. 3-*) per scaricare dalla stagione specificata fino alla fine",
+            "Menu di selezione delle stagioni\n\n"
+            "- Inserisci il numero della stagione (ad esempio, 1)\n"
+            "- Inserisci * per scaricare tutte le stagioni\n"
+            "- Inserisci un intervallo di stagioni (ad esempio, 1-2) per scaricare da una stagione all'altra\n"
+            "- Inserisci (ad esempio, 3-*) per scaricare dalla stagione specificata fino alla fine della serie",
             None
         )
 

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -52,6 +52,8 @@ def title_search(title_search: str) -> int:
 
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
+        if site_constant.TELEGRAM_BOT:
+            bot.send_message(f"ERRORE\n\nErrore nella richiesta di ricerca:\n\n{e}", None)
         return 0
 
     # Prepara le scelte per l'utente
@@ -82,6 +84,8 @@ def title_search(title_search: str) -> int:
             
         except Exception as e:
             print(f"Error parsing a film entry: {e}")
+            if site_constant.TELEGRAM_BOT:
+                bot.send_message(f"ERRORE\n\nErrore nell'analisi del film:\n\n{e}", None)
 	
     if site_constant.TELEGRAM_BOT:
         if choices:

StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -37,7 +37,7 @@ from ...M3U8 import (
 # Config
 TQDM_DELAY_WORKER = config_manager.get_float('M3U8_DOWNLOAD', 'tqdm_delay')
 REQUEST_MAX_RETRY = config_manager.get_int('REQUESTS', 'max_retry')
-REQUEST_VERIFY = config_manager.get_int('REQUESTS', 'verify')
+REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
 DEFAULT_VIDEO_WORKERS = config_manager.get_int('M3U8_DOWNLOAD', 'default_video_workser')
 DEFAULT_AUDIO_WORKERS = config_manager.get_int('M3U8_DOWNLOAD', 'default_audio_workser')
 MAX_TIMEOOUT = config_manager.get_int("REQUESTS", "timeout")

StreamingCommunity/Lib/Downloader/MP4/downloader.py

@@ -31,7 +31,6 @@ from ...FFmpeg import print_duration_table
 
 # Config
 REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
-REQUEST_HTTP2 = config_manager.get_bool('REQUESTS', 'http2')
 GET_ONLY_LINK = config_manager.get_bool('M3U8_PARSER', 'get_only_link')
 REQUEST_TIMEOUT = config_manager.get_float('REQUESTS', 'timeout')
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
@@ -111,11 +110,12 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     interrupt_handler = InterruptHandler()
     original_handler = signal.signal(signal.SIGINT, partial(signal_handler, interrupt_handler=interrupt_handler, original_handler=signal.getsignal(signal.SIGINT)))
 
+    # Ensure the output directory exists
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+
     try:
-        transport = httpx.HTTPTransport(verify=REQUEST_VERIFY, http2=REQUEST_HTTP2)
-        
-        with httpx.Client(transport=transport, timeout=httpx.Timeout(60)) as client:
-            with client.stream("GET", url, headers=headers, timeout=REQUEST_TIMEOUT) as response:
+        with httpx.Client() as client:
+            with client.stream("GET", url, headers=headers) as response:
                 response.raise_for_status()
                 total = int(response.headers.get('content-length', 0))
                 
@@ -123,6 +123,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
                     console.print("[bold red]No video stream found.[/bold red]")
                     return None, False
 
+                # Create a fancy progress bar
                 progress_bar = tqdm(
                     total=total,
                     ascii='░▒█',
@@ -135,7 +136,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
                     unit_scale=True,
                     desc='Downloading',
                     mininterval=0.05,
-                    file=sys.stdout                         # Using file=sys.stdout to force in-place updates because sys.stderr may not support carriage returns in this environment.
+                    file=sys.stdout                         # Using file=sys.stdout to force in-place updates because sys.stderr may not support carriage returns in this environment.  
                 )
 
                 downloaded = 0

StreamingCommunity/Upload/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = '2.9.4'
+__version__ = '2.9.5'
 __author__ = 'Arrowar'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2024'

StreamingCommunity/Util/config_json.py

@@ -196,6 +196,7 @@ class ConfigManager:
         except Exception as e:
             logging.error(f"Error reading configuration file: {e}")
             console.print(f"[bold red]Failed to read configuration:[/bold red] {str(e)}")
+            sys.exit(0)
 
     def download_requirements(self, url: str, filename: str) -> None:
         """
@@ -255,14 +256,7 @@ class ConfigManager:
                             sites_info = []
                             for site, info in examples:
                                 sites_info.append(f"[cyan]{site}[/cyan]: {info.get('full_url', 'N/A')}")
-                            
-                            console.print("[bold cyan]Sample sites:[/bold cyan]")
-                            for info in sites_info:
-                                console.print(f"  {info}")
-                            
-                            if site_count > 3:
-                                console.print(f"  ... and {site_count - 3} more")
-                                
+
                     else:
                         console.print("[bold yellow]API returned empty data set[/bold yellow]")
                 else:

StreamingCommunity/Util/table.py

@@ -147,9 +147,14 @@ class TVShowManager:
                 if not force_int_input:
                     prompt_msg = ("\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
                                 "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end")
+                    telegram_msg = "Menu di selezione degli episodi: \n\n" \
+                                   "- Inserisci il numero dell'episodio (ad esempio, 1)\n" \
+                                   "- Inserisci * per scaricare tutti gli episodi\n" \
+                                   "- Inserisci un intervallo di episodi (ad esempio, 1-2) per scaricare da un episodio all'altro\n" \
+                                   "- Inserisci (ad esempio, 3-*) per scaricare dall'episodio specificato fino alla fine della serie"
                     
                     if is_telegram:
-                        key = bot.ask("select_title_episode", prompt_msg, None)
+                        key = bot.ask("select_title_episode", telegram_msg, None)
                     else:
                         key = Prompt.ask(prompt_msg)
                 else:
@@ -183,9 +188,14 @@ class TVShowManager:
                 if not force_int_input:
                     prompt_msg = ("\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
                                 "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end")
+                    telegram_msg = "Menu di selezione degli episodi: \n\n" \
+                                   "- Inserisci il numero dell'episodio (ad esempio, 1)\n" \
+                                   "- Inserisci * per scaricare tutti gli episodi\n" \
+                                   "- Inserisci un intervallo di episodi (ad esempio, 1-2) per scaricare da un episodio all'altro\n" \
+                                   "- Inserisci (ad esempio, 3-*) per scaricare dall'episodio specificato fino alla fine della serie"
                     
                     if is_telegram:
-                        key = bot.ask("select_title_episode", prompt_msg, None)
+                        key = bot.ask("select_title_episode", telegram_msg, None)
                     else:
                         key = Prompt.ask(prompt_msg)
                 else: