StreamingCommunity 3.3.2__py3-none-any.whl → 3.3.5__py3-none-any.whl

StreamingCommunity/Lib/Downloader/DASH/decrypt.py

@@ -9,6 +9,9 @@ import logging
 from rich.console import Console
 
 
+# Internal utilities
+from StreamingCommunity.Util.os import get_mp4decrypt_path
+
 # Variable
 console = Console()
 
@@ -45,7 +48,7 @@ def decrypt_with_mp4decrypt(encrypted_path, kid, key, output_path=None, cleanup=
         output_path = os.path.splitext(encrypted_path)[0] + "_decrypted.mp4"
 
     key_format = f"{kid.lower()}:{key.lower()}"
-    cmd = ["mp4decrypt", "--key", key_format, encrypted_path, output_path]
+    cmd = [get_mp4decrypt_path(), "--key", key_format, encrypted_path, output_path]
     logging.info(f"Running command: {' '.join(cmd)}")
 
     try:

StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -73,13 +73,15 @@ class M3U8_Segments:
         self.class_url_fixer = M3U8_UrlFix(url)
 
         # Sync
-        self.queue = PriorityQueue()
+        self.queue = PriorityQueue(maxsize=20)
         self.buffer = {}
         self.expected_index = 0 
+        self.write_buffer = bytearray()  
+        self.write_batch_size = 50
 
         self.stop_event = threading.Event()
         self.downloaded_segments = set()
-        self.base_timeout = 0.5
+        self.base_timeout = 1.0
         self.current_timeout = 3.0
 
         # Stopping
@@ -89,6 +91,10 @@ class M3U8_Segments:
         self.force_stop = False
         self.interrupt_lock = threading.Lock()
 
+        # HTTP Client
+        self._client = None
+        self._client_lock = threading.Lock()
+
         # OTHER INFO
         self.info_maxRetry = 0
         self.info_nRetry = 0
@@ -96,6 +102,9 @@ class M3U8_Segments:
         self.active_retries = 0 
         self.active_retries_lock = threading.Lock()
 
+        self._last_progress_update = 0
+        self._progress_update_interval = 0.5
+
     def __get_key__(self, m3u8_parser: M3U8_Parser) -> bytes:
         """
         Fetches the encryption key from the M3U8 playlist.
@@ -151,11 +160,6 @@ class M3U8_Segments:
     def get_info(self) -> None:
         """
         Retrieves M3U8 playlist information from the given URL.
-
-        If the URL is an index URL, this method:
-            - Sends an HTTP GET request to fetch the M3U8 playlist.
-            - Parses the M3U8 content using `parse_data`.
-            - Saves the playlist to a temporary folder.
         """
         if self.is_index_url:
             try:
@@ -182,6 +186,7 @@ class M3U8_Segments:
                     
             if self.force_stop:
                 console.print("\n[red]Force stop triggered! Exiting immediately.")
+                self._cleanup_client()
 
             else:
                 if not self.interrupt_flag.is_set():
@@ -191,7 +196,6 @@ class M3U8_Segments:
 
                     if remaining == 1:
                         self.interrupt_flag.set()
-
                     
         if threading.current_thread() is threading.main_thread():
             signal.signal(signal.SIGINT, interrupt_handler)
@@ -199,72 +203,119 @@ class M3U8_Segments:
             print("Signal handler must be set in the main thread")
 
     def _get_http_client(self):
-        return create_client(headers={'User-Agent': get_userAgent()}, follow_redirects=True)
+        """
+        Get a reusable HTTP client using the centralized factory.
+        Uses optimized settings for segment downloading.
+        """
+        if self._client is None:
+            with self._client_lock:
+                self._client = create_client(
+                    timeout=SEGMENT_MAX_TIMEOUT
+                )
+                
+        return self._client
+    
+    def _cleanup_client(self):
+        """Pulizia client"""
+        if self._client:
+            try:
+                self._client.close()
+            except Exception:
+                pass
+            self._client = None
                             
-    def download_segment(self, ts_url: str, index: int, progress_bar: tqdm, backoff_factor: float = 1.1) -> None:
+    def download_segment(self, ts_url: str, index: int, progress_bar: tqdm, backoff_factor: float = 1.02) -> None:
         """
-        Downloads a TS segment and adds it to the segment queue with retry logic.
+        Downloads a TS segment
 
         Parameters:
             - ts_url (str): The URL of the TS segment.
             - index (int): The index of the segment.
             - progress_bar (tqdm): Progress counter for tracking download progress.
-            - backoff_factor (float): The backoff factor for exponential backoff (default is 1.5 seconds).
+            - backoff_factor (float): Backoff factor.
         """
         for attempt in range(REQUEST_MAX_RETRY):
             if self.interrupt_flag.is_set():
                 return
             
             try:
-                with self._get_http_client() as client:
-                    response = client.get(ts_url)
-        
-                    # Validate response and content
-                    response.raise_for_status()
-                    segment_content = response.content
-                    content_size = len(segment_content)
-
-                    # Decrypt if needed and verify decrypted content
-                    if self.decryption is not None:
-                        try:
-                            segment_content = self.decryption.decrypt(segment_content)
-                            
-                        except Exception as e:
-                            logging.error(f"Decryption failed for segment {index}: {str(e)}")
-                            self.interrupt_flag.set()   # Interrupt the download process
-                            self.stop_event.set()       # Trigger the stopping event for all threads
-                            break                       # Stop the current task immediately
+                client = self._get_http_client()
+                timeout = min(SEGMENT_MAX_TIMEOUT, 10 + attempt * 5)
+
+                # Make request
+                response = client.get(ts_url, timeout=timeout, headers={"User-Agent": get_userAgent()})
+                response.raise_for_status()
+                segment_content = response.content
+                content_size = len(segment_content)
+
+                # Decrypt if needed
+                if self.decryption is not None:
+                    try:
+                        segment_content = self.decryption.decrypt(segment_content)
+                    except Exception as e:
+                        logging.error(f"Decryption failed for segment {index}: {str(e)}")
+
+                        if attempt + 1 == REQUEST_MAX_RETRY:
+                            self.interrupt_flag.set()
+                            self.stop_event.set()
+
+                        raise e
 
+                current_time = time.time()
+                if current_time - self._last_progress_update > self._progress_update_interval:
                     self.class_ts_estimator.update_progress_bar(content_size, progress_bar)
-                    self.queue.put((index, segment_content))
+                    self._last_progress_update = current_time
+                
+                try:
+                    self.queue.put((index, segment_content), timeout=0.05)
                     self.downloaded_segments.add(index)  
                     progress_bar.update(1)
                     return
+                
+                except queue.Full:
+                    time.sleep(0.02)
+
+                    try:
+                        self.queue.put((index, segment_content), timeout=0.1)
+                        self.downloaded_segments.add(index)  
+                        progress_bar.update(1)
+                        return
+                    
+                    except queue.Full:
+                        self.queue.put((index, segment_content))
+                        self.downloaded_segments.add(index)  
+                        progress_bar.update(1)
+                        return
 
             except Exception as e:
-                logging.info(f"Attempt {attempt + 1} failed for segment {index} - '{ts_url}': {e}")
+                error_msg = str(e)
+                
+                if attempt == 0:
+                    logging.warning(f"Segment {index} failed on first attempt: {error_msg}")
                 
                 if attempt > self.info_maxRetry:
-                    self.info_maxRetry = ( attempt + 1 )
+                    self.info_maxRetry = attempt + 1
                 self.info_nRetry += 1
 
                 if attempt + 1 == REQUEST_MAX_RETRY:
                     console.print(f"[red]Final retry failed for segment: {index}")
-                    self.queue.put((index, None))  # Marker for failed segment
+                    
+                    try:
+                        self.queue.put((index, None), timeout=0.1)
+                    except queue.Full:
+                        time.sleep(0.02)
+                        self.queue.put((index, None))
+
                     progress_bar.update(1)
                     self.info_nFailed += 1
                     return
                 
-                with self.active_retries_lock:
-                    self.active_retries += 1
+                if attempt < 2:
+                    sleep_time = 0.5 + attempt * 0.5
+                else:
+                    sleep_time = min(3.0, backoff_factor ** attempt)
                 
-                #sleep_time = backoff_factor * (2 ** attempt)
-                sleep_time = backoff_factor * (attempt + 1)
-                logging.info(f"Retrying segment {index} in {sleep_time} seconds...")
                 time.sleep(sleep_time)
-                
-                with self.active_retries_lock:
-                    self.active_retries -= 1
 
     def write_segments_to_file(self):
         """
@@ -325,8 +376,6 @@ class M3U8_Segments:
             - type (str): Type of download: 'video' or 'audio'
         """
         if TELEGRAM_BOT:
-
-          # Viene usato per lo screen 
           console.log("####")
           
         self.get_info()
@@ -337,59 +386,64 @@ class M3U8_Segments:
             unit='s',
             ascii='░▒█',
             bar_format=self._get_bar_format(description),
-            mininterval=0.6,
-            maxinterval=1.0,
-            file=sys.stdout,        # Using file=sys.stdout to force in-place updates because sys.stderr may not support carriage returns in this environment.
+            mininterval=2.0,
+            maxinterval=5.0,
+            file=sys.stdout,
         )
 
         try:
             writer_thread = threading.Thread(target=self.write_segments_to_file)
             writer_thread.daemon = True
             writer_thread.start()
-
-            # Configure workers and delay
             max_workers = self._get_worker_count(type)
             
-            # Download segments with completion verification
             with ThreadPoolExecutor(max_workers=max_workers) as executor:
                 futures = []
+                
                 for index, segment_url in enumerate(self.segments):
-
-                    # Check for interrupt before submitting each task
                     if self.interrupt_flag.is_set():
                         break
 
-                    time.sleep(TQDM_DELAY_WORKER)
+                    # Delay every 200 submissions to reduce CPU usage
+                    if index % 200 == 0 and index > 0:
+                        time.sleep(TQDM_DELAY_WORKER)
+                        
                     futures.append(executor.submit(self.download_segment, segment_url, index, progress_bar))
 
-                # Wait for futures with interrupt handling
+                # Process completed futures
                 for future in as_completed(futures):
                     if self.interrupt_flag.is_set():
                         break
                     try:
-                        future.result()
+                        future.result(timeout=1.0)
                     except Exception as e:
                         logging.error(f"Error in download thread: {str(e)}")
 
-                # Interrupt handling for missing segments
+                # Retry missing segments if necessary
                 if not self.interrupt_flag.is_set():
                     total_segments = len(self.segments)
                     completed_segments = len(self.downloaded_segments)
                     
                     if completed_segments < total_segments:
                         missing_segments = set(range(total_segments)) - self.downloaded_segments
-                        logging.warning(f"Missing segments: {sorted(missing_segments)}")
-                        
-                        # Retry missing segments with interrupt check
-                        for index in missing_segments:
-                            if self.interrupt_flag.is_set():
-                                break
+                        logging.warning(f"Missing {len(missing_segments)} segments")
 
-                            try:
-                                self.download_segment(self.segments[index], index, progress_bar)
-                                
-                            except Exception as e:
-                                logging.error(f"Failed to retry segment {index}: {str(e)}")
+                        # Retry missing segments with interrupt check
+                        retry_workers = min(2, len(missing_segments))
+                        if retry_workers > 0:
+                            retry_futures = []
+                            for index in missing_segments:
+                                if self.interrupt_flag.is_set():
+                                    break
+                                retry_futures.append(executor.submit(self.download_segment, self.segments[index], index, progress_bar))
+                            
+                            for future in as_completed(retry_futures):
+                                if self.interrupt_flag.is_set():
+                                    break
+                                try:
+                                    future.result(timeout=2.0)
+                                except Exception as e:
+                                    logging.error(f"Failed to retry segment: {str(e)}")
 
         finally:
             self._cleanup_resources(writer_thread, progress_bar)
@@ -412,14 +466,12 @@ class M3U8_Segments:
     
     def _get_worker_count(self, stream_type: str) -> int:
         """
-        Calculate optimal parallel workers based on stream type and infrastructure.
+        Return parallel workers based on stream type and infrastructure.
         """
-        base_workers = {
+        return {
             'video': DEFAULT_VIDEO_WORKERS,
             'audio': DEFAULT_AUDIO_WORKERS
         }.get(stream_type.lower(), 1)
-
-        return base_workers
     
     def _generate_results(self, stream_type: str) -> Dict:
         """Package final download results."""
@@ -441,11 +493,13 @@ class M3U8_Segments:
         self.stop_event.set()
         writer_thread.join(timeout=30)
         progress_bar.close()
+        self._cleanup_client()
         
         if self.info_nFailed > 0:
             self._display_error_summary()
 
         self.buffer = {}
+        self.write_buffer.clear()
         self.expected_index = 0
 
     def _display_error_summary(self) -> None:
@@ -456,4 +510,4 @@ class M3U8_Segments:
                      f"[white]Failed segments: [red]{self.info_nFailed}")
         
         if self.info_nRetry > len(self.segments) * 0.3:
-            console.print("[yellow]Warning: High retry count detected. Consider reducing worker count in config.")
+            console.print("[yellow]Warning: High retry count detected. Consider reducing worker count in config.")

StreamingCommunity/Lib/M3U8/estimator.py

@@ -30,7 +30,6 @@ class M3U8_Ts_Estimator:
         self.lock = threading.Lock()
         self.speed = {"upload": "N/A", "download": "N/A"}
         self._running = True
-        
         self.speed_thread = threading.Thread(target=self.capture_speed)
         self.speed_thread.daemon = True
         self.speed_thread.start()
@@ -47,14 +46,15 @@ class M3U8_Ts_Estimator:
 
         self.ts_file_sizes.append(size)
 
-    def capture_speed(self, interval: float = 1.5):
-        """Capture the internet speed periodically with improved efficiency."""
+    def capture_speed(self, interval: float = 3.0):
+        """Capture the internet speed periodically."""
         last_upload, last_download = 0, 0
         speed_buffer = deque(maxlen=3)
+        error_count = 0
+        max_errors = 5
         
         while self._running:
             try:
-                # Get IO counters only once per loop to reduce function calls
                 io_counters = psutil.net_io_counters()
                 if not io_counters:
                     raise ValueError("No IO counters available")
@@ -65,28 +65,39 @@ class M3U8_Ts_Estimator:
                     upload_speed = (current_upload - last_upload) / interval
                     download_speed = (current_download - last_download) / interval
                     
-                    # Only update buffer when we have valid data
-                    if download_speed > 0:
+                    if download_speed > 1024:
                         speed_buffer.append(download_speed)
-                    
-                    # Use a more efficient approach for thread synchronization
-                    avg_speed = sum(speed_buffer) / len(speed_buffer) if speed_buffer else 0
-                    formatted_upload = internet_manager.format_transfer_speed(max(0, upload_speed))
-                    formatted_download = internet_manager.format_transfer_speed(avg_speed)
-                    
-                    # Minimize lock time by preparing data outside the lock
-                    with self.lock:
-                        self.speed = {
-                            "upload": formatted_upload,
-                            "download": formatted_download
-                        }
+
+                        if speed_buffer:
+                            avg_speed = sum(speed_buffer) / len(speed_buffer)
+                            
+                            try:
+                                formatted_upload = internet_manager.format_transfer_speed(max(0, upload_speed))
+                                formatted_download = internet_manager.format_transfer_speed(avg_speed)
+                                
+                                # Lock minimale
+                                with self.lock:
+                                    self.speed = {
+                                        "upload": formatted_upload,
+                                        "download": formatted_download
+                                    }
+
+                            except ImportError:
+                                with self.lock:
+                                    self.speed = {"upload": "N/A", "download": "N/A"}
                 
                 last_upload, last_download = current_upload, current_download
+                error_count = 0
                 
             except Exception as e:
-                if self._running:  # Only log if we're still supposed to be running
-                    logging.error(f"Error in speed capture: {str(e)}")
-                self.speed = {"upload": "N/A", "download": "N/A"}
+                error_count += 1
+                if error_count <= max_errors and self._running:
+                    logging.debug(f"Speed capture error: {str(e)}")
+                
+                if error_count > max_errors:
+                    with self.lock:
+                        self.speed = {"upload": "N/A", "download": "N/A"}
+                    interval = 10.0
             
             time.sleep(interval)
 
@@ -98,7 +109,6 @@ class M3U8_Ts_Estimator:
             str: The mean size of the files in a human-readable format.
         """
         try:
-            # Only do calculations if we have data
             if not self.ts_file_sizes:
                 return "0 B"
                 
@@ -111,6 +121,7 @@ class M3U8_Ts_Estimator:
             return "Error"
     
     def update_progress_bar(self, total_downloaded: int, progress_counter: tqdm) -> None:
+        """Update progress bar"""
         try:
             self.add_ts_file(total_downloaded * self.total_segments)
             
@@ -118,27 +129,26 @@ class M3U8_Ts_Estimator:
             if file_total_size == "Error":
                 return
                 
-            number_file_total_size = file_total_size.split(' ')[0]
-            units_file_total_size = file_total_size.split(' ')[1]
-            
-            # Get speed data outside of any locks
-            speed_data = ["N/A", ""]
+            number_file_total_size, units_file_total_size = file_total_size.split(' ', 1)
+        
             with self.lock:
                 download_speed = self.speed['download']
             
-            if download_speed != "N/A":
-                speed_data = download_speed.split(" ")
-            
-            average_internet_speed = speed_data[0] if len(speed_data) >= 1 else "N/A"
-            average_internet_unit = speed_data[1] if len(speed_data) >= 2 else ""
+            if download_speed != "N/A" and ' ' in download_speed:
+                average_internet_speed, average_internet_unit = download_speed.split(' ', 1)
+            else:
+                average_internet_speed, average_internet_unit = "N/A", ""
             
             progress_str = (
                 f"{Colors.GREEN}{number_file_total_size} {Colors.RED}{units_file_total_size}"
                 f"{Colors.WHITE}, {Colors.CYAN}{average_internet_speed} {Colors.RED}{average_internet_unit} "
-                #f"{Colors.WHITE}, {Colors.GREEN}CRR {Colors.RED}{retry_count} "
             )
             
             progress_counter.set_postfix_str(progress_str)
             
         except Exception as e:
-            logging.error(f"Error updating progress bar: {str(e)}")
+            logging.error(f"Error updating progress bar: {str(e)}")
+            
+    def stop(self):
+        """Stop speed monitoring thread."""
+        self._running = False

StreamingCommunity/Upload/update.py

@@ -98,4 +98,4 @@ def update():
     console.print(f"\n[red]{__title__} has been downloaded [yellow]{total_download_count} [red]times, but only [yellow]{percentual_stars}% [red]of users have starred it.\n\
         [cyan]Help the repository grow today by leaving a [yellow]star [cyan]and [yellow]sharing [cyan]it with others online!")
     
-    time.sleep(4)
+    time.sleep(2.5)

StreamingCommunity/Upload/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = '3.3.2'
+__version__ = '3.3.5'
 __author__ = 'Arrowar'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2025'

StreamingCommunity/Util/installer/bento4_install.py

@@ -4,6 +4,8 @@ import os
 import shutil
 import zipfile
 import logging
+import subprocess
+from typing import Optional
 
 
 # External library
@@ -135,7 +137,6 @@ class Bento4Downloader:
                 os.remove(zip_path)
                 
                 if extracted_files:
-                    console.print("[bold green]Bento4 successfully installed[/]")
                     return extracted_files
                     
             raise Exception("Failed to install Bento4")
@@ -146,24 +147,53 @@ class Bento4Downloader:
             return []
 
 
-def check_mp4decrypt() -> str:
-    """Check for mp4decrypt in the system and download if not found."""
+def check_mp4decrypt() -> Optional[str]:
+    """
+    Check for mp4decrypt in the system and download if not found.
+    Order: system PATH (where/which) -> binary directory -> download
+    
+    Returns:
+        Optional[str]: Path to mp4decrypt executable or None if not found/downloaded
+    """
     try:
-        # First check if mp4decrypt is in PATH
-        mp4decrypt = "mp4decrypt.exe" if binary_paths.system == "windows" else "mp4decrypt"
-        mp4decrypt_path = shutil.which(mp4decrypt)
+        system_platform = binary_paths.system
         
-        if mp4decrypt_path:
-            return mp4decrypt_path
+        # STEP 1: Check system PATH
+        console.print("[cyan]Checking for mp4decrypt in system PATH...[/]")
+        mp4decrypt_name = "mp4decrypt.exe" if system_platform == "windows" else "mp4decrypt"
+        mp4decrypt_path = None
+        
+        if system_platform == 'windows':
+            try:
+                mp4decrypt_path = subprocess.check_output(
+                    ['where', mp4decrypt_name], stderr=subprocess.DEVNULL, text=True
+                ).strip().split('\n')[0]
+                
+                if mp4decrypt_path:
+                    logging.info("mp4decrypt found in Windows system PATH")
+                    return mp4decrypt_path
+                    
+            except subprocess.CalledProcessError:
+                logging.info("mp4decrypt not found in Windows system PATH")
+        
+        else:
+            mp4decrypt_path = shutil.which(mp4decrypt_name)
+            
+            if mp4decrypt_path:
+                logging.info("mp4decrypt found in system PATH")
+                return mp4decrypt_path
 
-        # If not found, check in binary directory
+        # STEP 2: Check in binary directory
+        console.print("[cyan]Checking for mp4decrypt in binary directory...[/]")
         binary_dir = binary_paths.get_binary_directory()
-        local_path = os.path.join(binary_dir, mp4decrypt)
+        local_path = os.path.join(binary_dir, mp4decrypt_name)
         
-        if os.path.exists(local_path):
+        if os.path.exists(local_path) and os.access(local_path, os.X_OK):
+            logging.info("mp4decrypt found in binary directory")
             return local_path
 
-        # Download if not found
+        # STEP 3: Download if not found
+        console.print("[cyan]mp4decrypt not found. Downloading...[/]")
         downloader = Bento4Downloader()
         extracted_files = downloader.download()
         return extracted_files[0] if extracted_files else None