StreamingCommunity 2.0.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

StreamingCommunity/Api/Site/1337xx/__init__.py

@@ -27,7 +27,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
     
     # Search on database
     len_database = title_search(quote_plus(string_to_search))

StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -27,7 +27,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
 
     # Search on database
     len_database = title_search(quote_plus(string_to_search))

StreamingCommunity/Api/Site/animeunity/__init__.py

@@ -24,7 +24,7 @@ from .costant import SITE_NAME
 def search(string_to_search: str = None, get_onylDatabase: bool = False):
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
 
     # Search on database
     len_database = title_search(quote_plus(string_to_search))

StreamingCommunity/Api/Site/cb01new/__init__.py

@@ -27,7 +27,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
 
     # Search on database
     len_database = title_search(quote_plus(string_to_search))

StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py

@@ -28,9 +28,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-
-        # Make request to site to get content that corrsisponde to that string
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
     
     # Search on database
     len_database = title_search(quote_plus(string_to_search))

StreamingCommunity/Api/Site/ddlstreamitaly/series.py

@@ -25,7 +25,6 @@ from StreamingCommunity.Api.Player.ddl import VideoSource
 
 # Variable
 from .costant import ROOT_PATH, SERIES_FOLDER
-table_show_manager = TVShowManager()
 
 
 
@@ -120,6 +119,7 @@ def display_episodes_list(obj_episode_manager) -> str:
     """
 
     # Set up table for displaying episodes
+    table_show_manager = TVShowManager()
     table_show_manager.set_slice_end(10)
 
     # Add columns to the table

StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -27,9 +27,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-
-        # Make request to site to get content that corrsisponde to that string
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
     
     # Search on database
     len_database = title_search(quote_plus(string_to_search))

StreamingCommunity/Api/Site/guardaserie/series.py

@@ -25,7 +25,6 @@ from StreamingCommunity.Api.Player.supervideo import VideoSource
 
 # Variable
 from .costant import ROOT_PATH, SERIES_FOLDER
-table_show_manager = TVShowManager()
 
 
 
@@ -171,8 +170,9 @@ def display_episodes_list(obj_episode_manager) -> str:
     Returns:
         last_command (str): Last command entered by the user.
     """
-
+    
     # Set up table for displaying episodes
+    table_show_manager = TVShowManager()
     table_show_manager.set_slice_end(10)
 
     # Add columns to the table

StreamingCommunity/Api/Site/ilcorsaronero/__init__.py

@@ -28,7 +28,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
     
     # Search on database
     len_database = asyncio.run(title_search(quote_plus(string_to_search)))

StreamingCommunity/Api/Site/ilcorsaronero/util/ilCorsarScraper.py

@@ -25,13 +25,21 @@ class IlCorsaroNeroScraper:
         self.base_url = base_url
         self.max_page = max_page
         self.headers = {
-            'User-Agent': get_headers(),
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
-            'Accept-Language': 'en-US,en;q=0.5',
-            'Connection': 'keep-alive',
-            'Upgrade-Insecure-Requests': '1'
+            'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+            'accept-language': 'it-IT,it;q=0.9,en-US;q=0.8,en;q=0.7',
+            'cache-control': 'max-age=0',
+            'priority': 'u=0, i',
+            'sec-ch-ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'document',
+            'sec-fetch-mode': 'navigate',
+            'sec-fetch-site': 'same-origin',
+            'sec-fetch-user': '?1',
+            'upgrade-insecure-requests': '1',
+            'user-agent': get_headers()
         }
-
+        
     async def fetch_url(self, url: str) -> Optional[str]:
         """
         Fetch the HTML content of a given URL.

StreamingCommunity/Api/Site/mostraguarda/__init__.py

@@ -27,7 +27,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
 
     # Not available for the moment
     if get_onylDatabase:

StreamingCommunity/Api/Site/mostraguarda/film.py

@@ -70,10 +70,8 @@ def download_film(movie_details: Json_film) -> str:
     player_links = soup.find("ul", class_ = "_player-mirrors").find_all("li")
     supervideo_url = "https:" + player_links[0].get("data-link")
 
-    
     # Set domain and media ID for the video source
-    video_source = VideoSource()
-    video_source.setup(supervideo_url)
+    video_source = VideoSource(url=supervideo_url)
     
     # Define output path
     title_name = os_manager.get_sanitize_file(movie_details.title) + ".mp4"

StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -28,7 +28,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
     """
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert word to search in [red]{SITE_NAME}").strip()
+        string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{SITE_NAME}").strip()
 
     # Get site domain and version and get result of the search
     site_version, domain = get_version_and_domain()

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -39,7 +39,7 @@ def download_film(select_title: MediaItem) -> str:
 
     # Start message and display film information
     start_message()
-    console.print(f"[yellow]Download:  [red]{select_title.slug} \n")
+    console.print(f"[yellow]Download: [red]{select_title.name} \n")
 
     # Init class
     video_source = VideoSource(SITE_NAME, False)

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -25,7 +25,6 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 # Variable
 from .costant import ROOT_PATH, SITE_NAME, SERIES_FOLDER
-table_show_manager = TVShowManager()
 
 
 
@@ -178,6 +177,7 @@ def display_episodes_list(scrape_serie) -> str:
     """
 
     # Set up table for displaying episodes
+    table_show_manager = TVShowManager()
     table_show_manager.set_slice_end(10)
 
     # Add columns to the table

StreamingCommunity/Api/Template/Util/get_domain.py

@@ -76,17 +76,19 @@ def get_final_redirect_url(initial_url, max_timeout):
         console.print(f"\n[cyan]Test url[white]: [red]{initial_url}, [cyan]error[white]: [red]{e}")
         return None
 
-def search_domain(site_name: str, base_url: str):
+def search_domain(site_name: str, base_url: str, get_first: bool = False):
     """
     Search for a valid domain for the given site name and base URL.
 
     Parameters:
         - site_name (str): The name of the site to search the domain for.
         - base_url (str): The base URL to construct complete URLs.
+        - get_first (bool): If True, automatically update to the first valid match without user confirmation.
 
     Returns:
         tuple: The found domain and the complete URL.
     """
+    
     # Extract config domain
     max_timeout = config_manager.get_int("REQUESTS", "timeout")
     domain = str(config_manager.get_dict("SITE", site_name)['domain'])
@@ -107,10 +109,10 @@ def search_domain(site_name: str, base_url: str):
 
     except Exception as e:
         query = base_url.split("/")[-1]
-        
+
         # Perform a Google search with multiple results
         search_results = list(search(query, num_results=10, lang="it"))
-        console.print(f"\nGoogle search results: {search_results}")
+        #console.print(f"\nGoogle search results: {search_results}")
 
         def normalize_for_comparison(url):
             """Normalize URL by removing protocol, www, and trailing slashes"""
@@ -121,15 +123,15 @@ def search_domain(site_name: str, base_url: str):
 
         # Normalize the base_url we're looking for
         target_url = normalize_for_comparison(base_url)
-        
+
         # Iterate through search results
         for first_url in search_results:
             console.print(f"[green]Checking url[white]: [red]{first_url}")
-            
+
             # Get just the domain part of the search result
             parsed_result = urlparse(first_url)
             result_domain = normalize_for_comparison(parsed_result.netloc)
-            
+
             # Compare with our target URL (without the protocol part)
             if result_domain.startswith(target_url.split("/")[-1]):
                 try:
@@ -143,21 +145,20 @@ def search_domain(site_name: str, base_url: str):
 
                         new_domain_extract = extract_domain(str(final_url))
 
-                        if msg.ask(f"\n[cyan]Do you want to auto update site[white] [red]'{site_name}'[cyan] with domain[white] [red]'{new_domain_extract}'.", choices=["y", "n"], default="y").lower() == "y":
-                            
+                        if get_first or msg.ask(f"\n[cyan]Do you want to auto update site[white] [red]'{site_name}'[cyan] with domain[white] [red]'{new_domain_extract}'.", choices=["y", "n"], default="y").lower() == "y":
                             # Update domain in config.json
                             config_manager.config['SITE'][site_name]['domain'] = new_domain_extract
                             config_manager.write_config()
 
                             return new_domain_extract, f"{base_url}.{new_domain_extract}"
-                
+
                 except Exception as redirect_error:
                     console.print(f"[red]Error following redirect for {first_url}: {redirect_error}")
                     continue
 
-        # If no matching URL is found
+        # If no matching URL is found return base domain
         console.print("[bold red]No valid URL found matching the base URL.[/bold red]")
-        raise Exception("No matching domain found")
+        return domain, f"{base_url}.{domain}"
 
     # Handle successful initial domain check
     parsed_url = urlparse(str(response_follow.url))

StreamingCommunity/Lib/Downloader/HLS/downloader.py

@@ -176,9 +176,11 @@ class ContentExtractor:
             set_language = DOWNLOAD_SPECIFIC_AUDIO                      
             downloadable_languages = list(set(available_languages) & set(set_language))
 
-            console.print(f"[cyan bold]Audio:[/cyan bold] [green]Available:[/green] [purple]{', '.join(available_languages)}[/purple] | "
-                  f"[red]Set:[/red] [purple]{', '.join(set_language)}[/purple] | "
-                  f"[yellow]Downloadable:[/yellow] [purple]{', '.join(downloadable_languages)}[/purple]")
+            # Only show if there is something available
+            if len(available_languages) > 0:
+                console.print(f"[cyan bold]Audio    →[/cyan bold] [green]Available:[/green] [purple]{', '.join(available_languages)}[/purple] | "
+                    f"[red]Set:[/red] [purple]{', '.join(set_language)}[/purple] | "
+                    f"[yellow]Downloadable:[/yellow] [purple]{', '.join(downloadable_languages)}[/purple]")
 
         else:
             console.log("[red]Can't find a list of audios")
@@ -200,9 +202,11 @@ class ContentExtractor:
             set_language = DOWNLOAD_SPECIFIC_SUBTITLE
             downloadable_languages = list(set(available_languages) & set(set_language))
 
-            console.print(f"[cyan bold]Subtitle:[/cyan bold] [green]Available:[/green] [purple]{', '.join(available_languages)}[/purple] | "
-                  f"[red]Set:[/red] [purple]{', '.join(set_language)}[/purple] | "
-                  f"[yellow]Downloadable:[/yellow] [purple]{', '.join(downloadable_languages)}[/purple]")
+            # Only show if there is something available
+            if len(available_languages) > 0:
+                console.print(f"[cyan bold]Subtitle →[/cyan bold] [green]Available:[/green] [purple]{', '.join(available_languages)}[/purple] | "
+                    f"[red]Set:[/red] [purple]{', '.join(set_language)}[/purple] | "
+                    f"[yellow]Downloadable:[/yellow] [purple]{', '.join(downloadable_languages)}[/purple]")
 
         else:
             console.log("[red]Can't find a list of subtitles")
@@ -212,13 +216,18 @@ class ContentExtractor:
         It identifies the best video quality and displays relevant information to the user.
         """
         logging.info(f"class 'ContentExtractor'; call _collect_video()")
+        set_resolution = "Best"
 
         # Collect custom quality video if a specific resolution is set
         if FILTER_CUSTOM_REOLUTION != -1:
             self.m3u8_index, video_res = self.obj_parse._video.get_custom_uri(y_resolution=FILTER_CUSTOM_REOLUTION)
+            set_resolution = f"{FILTER_CUSTOM_REOLUTION}p"
 
-        # Otherwise, get the best available video quality
-        self.m3u8_index, video_res = self.obj_parse._video.get_best_uri()
+        else:
+
+            # Otherwise, get the best available video quality
+            self.m3u8_index, video_res = self.obj_parse._video.get_best_uri()
+            
         self.codec: M3U8_Codec = self.obj_parse.codec
 
         # List all available resolutions
@@ -227,18 +236,34 @@ class ContentExtractor:
         logging.info(f"M3U8 index selected: {self.m3u8_index}, with resolution: {video_res}")
 
         # Create a formatted table to display video info
-        console.print(f"[cyan bold]Video:[/cyan bold] [green]Available resolutions:[/green] [purple]{', '.join(list_available_resolution)}[/purple] | "
-              f"[yellow]Downloadable:[/yellow] [purple]{video_res[0]}x{video_res[1]}[/purple]")
+        console.print(f"[cyan bold]Video    →[/cyan bold] [green]Available:[/green] [purple]{', '.join(list_available_resolution)}[/purple] | "
+                  f"[red]Set:[/red] [purple]{set_resolution}[/purple] | "
+                  f"[yellow]Downloadable:[/yellow] [purple]{video_res[0]}x{video_res[1]}[/purple]")
 
         if self.codec is not None:
+            
+            # Generate the string for available codec information
+            available_codec_info = (
+                f"[green]v[/green]: [yellow]{self.codec.video_codec_name}[/yellow] "
+                f"([green]b[/green]: [yellow]{self.codec.video_bitrate // 1000}k[/yellow]), "
+                f"[green]a[/green]: [yellow]{self.codec.audio_codec_name}[/yellow] "
+                f"([green]b[/green]: [yellow]{self.codec.audio_bitrate // 1000}k[/yellow])"
+            )
+
+            # Determine what to display for "Set"
+            # If the codec usage is enabled in the configuration, use the detailed codec info
+            # Otherwise, display "copy"
             if config_manager.get_bool("M3U8_CONVERSION", "use_codec"):
-                codec_info = (f"[green]v[/green]: [yellow]{self.codec.video_codec_name}[/yellow] "
-                            f"([green]b[/green]: [yellow]{self.codec.video_bitrate // 1000}k[/yellow]), "
-                            f"[green]a[/green]: [yellow]{self.codec.audio_codec_name}[/yellow] "
-                            f"([green]b[/green]: [yellow]{self.codec.audio_bitrate // 1000}k[/yellow])")
+                set_codec_info = available_codec_info
             else:
-                codec_info = "[cyan]copy[/cyan]"
-            console.print(f"[bold green]Codec:[/bold green] {codec_info}")
+                set_codec_info = "[purple]copy[/purple]"
+
+            # Print the formatted result with "Available" and "Set" information
+            console.print(
+                f"[bold cyan]Codec    →[/bold cyan] [green]Available:[/green] {available_codec_info} | "
+                f"[red]Set:[/red] {set_codec_info}"
+            )
+
 
         # Fix the URL if it does not include the full protocol
         if "http" not in self.m3u8_index:
@@ -486,19 +511,6 @@ class ContentJoiner:
         self.there_is_audio = len(downloaded_audio) > 0
         self.there_is_subtitle = len(downloaded_subtitle) > 0
 
-        if self.there_is_audio or self.there_is_subtitle:
-
-            # Display the status of available media
-            table = Table(show_header=False, box=None)
-
-            table.add_row(f"[green]Video - audio", f"[yellow]{self.there_is_audio}")
-            table.add_row(f"[green]Video - Subtitle", f"[yellow]{self.there_is_subtitle}")
-
-            print("")
-            console.rule("[bold green] JOIN ", style="bold red")
-            console.print(table)
-            print("")
-
         # Start the joining process
         self.conversione()
 
@@ -584,10 +596,6 @@ class ContentJoiner:
         # Check if the joined video file already exists
         if not os.path.exists(path_join_video):
 
-            # Set codec to None if not defined in class
-            #if not hasattr(self, 'codec'):
-            #    self.codec = None
-
             # Join the video segments into a single video file
             join_video(
                 video_path=self.downloaded_video[0].get('path'),
@@ -844,7 +852,7 @@ class HLS_Downloader:
                 f"[bold green]Download completed![/bold green]\n"
                 f"[cyan]File size: [bold red]{formatted_size}[/bold red]\n"
                 f"[cyan]Duration: [bold]{formatted_duration}[/bold]\n"
-                f"[cyan]Output: [bold]{self.output_filename}[/bold]"
+                f"[cyan]Output: [bold]{os.path.abspath(self.output_filename)}[/bold]"
             )
 
             if missing_ts:

StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -432,7 +432,7 @@ class M3U8_Segments:
         if "audio" in str(type):
             TQDM_MAX_WORKER = AUDIO_WORKERS
 
-        console.print(f"[cyan]Video workers[white]: [green]{VIDEO_WORKERS} [white]| [cyan]Audio workers[white]: [green]{AUDIO_WORKERS}")
+        #console.print(f"[cyan]Video workers[white]: [green]{VIDEO_WORKERS} [white]| [cyan]Audio workers[white]: [green]{AUDIO_WORKERS}")
 
         # Custom bar for mobile and pc
         if TQDM_USE_LARGE_BAR:
@@ -544,18 +544,16 @@ class M3U8_Segments:
         file_size = os.path.getsize(self.tmp_file_path)
         if file_size == 0:
             raise Exception("Output file is empty")
-    
-        # Get expected time
-        ex_hours, ex_minutes, ex_seconds = format_duration(self.expected_real_time_s)
-        ex_formatted_duration = f"[yellow]{int(ex_hours)}[red]h [yellow]{int(ex_minutes)}[red]m [yellow]{int(ex_seconds)}[red]s"
-        console.print(f"[cyan]Max retry per URL[white]: [green]{self.info_maxRetry}[green] [white]| [cyan]Total retry done[white]: [green]{self.info_nRetry}[green] [white]| [cyan]Missing TS: [red]{self.info_nFailed} [white]| [cyan]Duration: {print_duration_table(self.tmp_file_path, None, True)} [white]| [cyan]Expected duation: {ex_formatted_duration} \n")
 
+        # Display additional 
         if self.info_nRetry >= len(self.segments) * (1/3.33):
-            console.print(
-                "[yellow]⚠ Warning:[/yellow] Too many retries detected! "
-                "Consider reducing the number of [cyan]workers[/cyan] in the [magenta]config.json[/magenta] file. "
-                "This will impact [bold]performance[/bold]. \n"
-            )
+
+            # Get expected time
+            ex_hours, ex_minutes, ex_seconds = format_duration(self.expected_real_time_s)
+            ex_formatted_duration = f"[yellow]{int(ex_hours)}[red]h [yellow]{int(ex_minutes)}[red]m [yellow]{int(ex_seconds)}[red]s"
+            console.print(f"[cyan]Max retry per URL[white]: [green]{self.info_maxRetry}[green] [white]| [cyan]Total retry done[white]: [green]{self.info_nRetry}[green] [white]| [cyan]Missing TS: [red]{self.info_nFailed} [white]| [cyan]Duration: {print_duration_table(self.tmp_file_path, None, True)} [white]| [cyan]Expected duation: {ex_formatted_duration} \n")
+
+            console.print("[yellow]⚠ Warning:[/yellow] Too many retries detected! Consider reducing the number of [cyan]workers[/cyan] in the [magenta]config.json[/magenta] file. This will impact [bold]performance[/bold]. \n")
 
         # Info to return
         return {'type': type, 'nFailed': self.info_nFailed}

StreamingCommunity/Lib/FFmpeg/capture.py

@@ -59,7 +59,7 @@ def capture_output(process: subprocess.Popen, description: str) -> None:
 
 
                         # Construct the progress string with formatted output information
-                        progress_string = (f"[yellow][FFmpeg] [white][{description}[white]]: "
+                        progress_string = (f"→ {description}[white]: "
                                            f"([green]'speed': [yellow]{data.get('speed', 'N/A')}[white], "
                                            f"[green]'size': [yellow]{internet_manager.format_file_size(byte_size)}[white])")
                         max_length = max(max_length, len(progress_string))

StreamingCommunity/Lib/FFmpeg/util.py

@@ -208,7 +208,7 @@ def is_png_format_or_codec(file_info):
     if not file_info:
         return False
     
-    console.print(f"[yellow][FFmpeg] [cyan]Avaiable codec[white]: [red]{file_info['codec_names']}")
+    #console.print(f"[yellow][FFmpeg] [cyan]Avaiable codec[white]: [red]{file_info['codec_names']}")
     return file_info['format_name'] == 'png_pipe' or 'png' in file_info['codec_names']
 
 

StreamingCommunity/Lib/M3U8/decryptor.py

@@ -17,7 +17,7 @@ crypto_installed = crypto_spec is not None
 
 
 if crypto_installed:
-    console.print("[cyan]Decrypy use: Cryptodomex")
+    logging.info("[cyan]Decrypy use: Cryptodomex")
     from Cryptodome.Cipher import AES
     from Cryptodome.Util.Padding import unpad
 
@@ -93,7 +93,7 @@ else:
     # Check if openssl command is available
     try:
         openssl_available = subprocess.run(["openssl", "version"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0
-        console.print("[cyan]Decrypy use: OPENSSL")
+        logging.info("[cyan]Decrypy use: OPENSSL")
     except:
         openssl_available = False