StreamingCommunity 1.8.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

StreamingCommunity/{Src/Lib → Lib}/Downloader/HLS/segments.py

@@ -19,12 +19,12 @@ from tqdm import tqdm
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.console import console
-from StreamingCommunity.Src.Util.headers import get_headers, random_headers
-from StreamingCommunity.Src.Util.color import Colors
-from StreamingCommunity.Src.Util._jsonConfig import config_manager
-from StreamingCommunity.Src.Util.os import os_manager
-from StreamingCommunity.Src.Util.call_stack import get_call_stack
+from StreamingCommunity.Util.console import console
+from StreamingCommunity.Util.headers import get_headers, random_headers
+from StreamingCommunity.Util.color import Colors
+from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.os import os_manager
+from StreamingCommunity.Util.call_stack import get_call_stack
 
 
 # Logic class
@@ -39,15 +39,19 @@ from .proxyes import main_test_proxy
 # Config
 TQDM_DELAY_WORKER = config_manager.get_float('M3U8_DOWNLOAD', 'tqdm_delay')
 TQDM_USE_LARGE_BAR = config_manager.get_int('M3U8_DOWNLOAD', 'tqdm_use_large_bar')
+
 REQUEST_MAX_RETRY = config_manager.get_int('REQUESTS', 'max_retry')
 REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify_ssl')
+
 THERE_IS_PROXY_LIST = os_manager.check_file("list_proxy.txt")
 PROXY_START_MIN = config_manager.get_float('REQUESTS', 'proxy_start_min')
 PROXY_START_MAX = config_manager.get_float('REQUESTS', 'proxy_start_max')
+
 DEFAULT_VIDEO_WORKERS = config_manager.get_int('M3U8_DOWNLOAD', 'default_video_workser')
 DEFAULT_AUDIO_WORKERS = config_manager.get_int('M3U8_DOWNLOAD', 'default_audio_workser')
 
 
+
 # Variable
 headers_index = config_manager.get_dict('REQUESTS', 'user-agent')
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
@@ -67,7 +71,8 @@ class M3U8_Segments:
         self.url = url
         self.tmp_folder = tmp_folder
         self.is_index_url = is_index_url
-        self.expected_real_time = None 
+        self.expected_real_time = None
+        self.max_timeout = max_timeout
         
         self.tmp_file_path = os.path.join(self.tmp_folder, "0.ts")
         os.makedirs(self.tmp_folder, exist_ok=True)
@@ -81,6 +86,8 @@ class M3U8_Segments:
         self.queue = PriorityQueue()
         self.stop_event = threading.Event()
         self.downloaded_segments = set()
+        self.base_timeout = 1.0
+        self.current_timeout = 5.0
 
         # Stopping
         self.interrupt_flag = threading.Event()
@@ -214,9 +221,12 @@ class M3U8_Segments:
                 self.download_interrupted = True
                 self.stop_event.set()
 
-        signal.signal(signal.SIGINT, interrupt_handler)
+        if threading.current_thread() is threading.main_thread():
+            signal.signal(signal.SIGINT, interrupt_handler)
+        else:
+            print("Signal handler must be set in the main thread")
 
-    def make_requests_stream(self, ts_url: str, index: int, progress_bar: tqdm, retries: int = 3, backoff_factor: float = 1.5) -> None:
+    def make_requests_stream(self, ts_url: str, index: int, progress_bar: tqdm, backoff_factor: float = 1.5) -> None:
         """
         Downloads a TS segment and adds it to the segment queue with retry logic.
 
@@ -226,14 +236,8 @@ class M3U8_Segments:
             - progress_bar (tqdm): Progress counter for tracking download progress.
             - retries (int): The number of times to retry on failure (default is 3).
             - backoff_factor (float): The backoff factor for exponential backoff (default is 1.5 seconds).
-        """
-        if self.interrupt_flag.is_set():
-            return
-        
-        need_verify = REQUEST_VERIFY
-        min_segment_size = 100  # Minimum acceptable size for a TS segment in bytes
-
-        for attempt in range(retries):
+        """       
+        for attempt in range(REQUEST_MAX_RETRY):
             if self.interrupt_flag.is_set():
                 return
             
@@ -247,7 +251,7 @@ class M3U8_Segments:
                     proxy = self.valid_proxy[index % len(self.valid_proxy)]
                     logging.info(f"Use proxy: {proxy}")
 
-                    with httpx.Client(proxies=proxy, verify=need_verify) as client:  
+                    with httpx.Client(proxies=proxy, verify=REQUEST_VERIFY) as client:  
                         if 'key_base_url' in self.__dict__:
                              response = client.get(
                                 url=ts_url, 
@@ -265,7 +269,7 @@ class M3U8_Segments:
                             )
 
                 else:
-                    with httpx.Client(verify=need_verify) as client_2:
+                    with httpx.Client(verify=REQUEST_VERIFY) as client_2:
                         if 'key_base_url' in self.__dict__:
                             response = client_2.get(
                                 url=ts_url, 
@@ -286,19 +290,12 @@ class M3U8_Segments:
                 response.raise_for_status()
                 segment_content = response.content
                 content_size = len(segment_content)
-
-                # Check if segment is too small (possibly corrupted or empty)
-                if content_size < min_segment_size:
-                    raise httpx.RequestError(f"Segment {index} too small ({content_size} bytes)")
-
                 duration = time.time() - start_time
 
                 # Decrypt if needed and verify decrypted content
                 if self.decryption is not None:
                     try:
                         segment_content = self.decryption.decrypt(segment_content)
-                        if len(segment_content) < min_segment_size:
-                            raise Exception(f"Decrypted segment {index} too small ({len(segment_content)} bytes)")
                         
                     except Exception as e:
                         logging.error(f"Decryption failed for segment {index}: {str(e)}")
@@ -318,10 +315,10 @@ class M3U8_Segments:
                 return
 
             except Exception as e:
-                #logging.error(f"Attempt {attempt + 1} failed for segment {index} - '{ts_url}': {e}")
+                logging.info(f"Attempt {attempt + 1} failed for segment {index} - '{ts_url}': {e}")
                 
-                if attempt + 1 == retries:
-                    #logging.error(f"Final retry failed for segment {index}")
+                if attempt + 1 == REQUEST_MAX_RETRY:
+                    console.log(f"[red]Final retry failed for segment: {index}")
                     self.queue.put((index, None))  # Marker for failed segment
                     progress_bar.update(1)
                     break
@@ -334,19 +331,20 @@ class M3U8_Segments:
         """
         Writes segments to file with additional verification.
         """
+        buffer = {}
+        expected_index = 0
+        segments_written = set()
+        
         with open(self.tmp_file_path, 'wb') as f:
-            expected_index = 0
-            buffer = {}
-            total_written = 0
-            segments_written = set()
-
             while not self.stop_event.is_set() or not self.queue.empty():
-                
                 if self.interrupt_flag.is_set():
                     break
                 
                 try:
-                    index, segment_content = self.queue.get(timeout=1)
+                    index, segment_content = self.queue.get(timeout=self.current_timeout)
+
+                    # Successful queue retrieval: reduce timeout
+                    self.current_timeout = max(self.base_timeout, self.current_timeout / 2)
 
                     # Handle failed segments
                     if segment_content is None:
@@ -357,7 +355,6 @@ class M3U8_Segments:
                     # Write segment if it's the next expected one
                     if index == expected_index:
                         f.write(segment_content)
-                        total_written += len(segment_content)
                         segments_written.add(index)
                         f.flush()
                         expected_index += 1
@@ -365,26 +362,25 @@ class M3U8_Segments:
                         # Write any buffered segments that are now in order
                         while expected_index in buffer:
                             next_segment = buffer.pop(expected_index)
+
                             if next_segment is not None:
                                 f.write(next_segment)
-                                total_written += len(next_segment)
                                 segments_written.add(expected_index)
                                 f.flush()
+
                             expected_index += 1
+                    
                     else:
                         buffer[index] = segment_content
 
                 except queue.Empty:
+                    self.current_timeout = min(self.max_timeout, self.current_timeout * 1.5)
+
                     if self.stop_event.is_set():
                         break
-                    continue
+
                 except Exception as e:
                     logging.error(f"Error writing segment {index}: {str(e)}")
-                    continue
-
-            # Final verification
-            if total_written == 0:
-                raise Exception("No data written to file")
     
     def download_streams(self, add_desc):
         """
@@ -493,8 +489,10 @@ class M3U8_Segments:
                         for index in missing_segments:
                             if self.interrupt_flag.is_set():
                                 break
+
                             try:
                                 self.make_requests_stream(self.segments[index], index, progress_bar)
+                                
                             except Exception as e:
                                 logging.error(f"Failed to retry segment {index}: {str(e)}")
 

StreamingCommunity/{Src/Lib → Lib}/Downloader/MP4/downloader.py

@@ -13,11 +13,11 @@ from tqdm import tqdm
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.headers import get_headers
-from StreamingCommunity.Src.Util.color import Colors
-from StreamingCommunity.Src.Util.console import console, Panel
-from StreamingCommunity.Src.Util._jsonConfig import config_manager
-from StreamingCommunity.Src.Util.os import internet_manager
+from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.color import Colors
+from StreamingCommunity.Util.console import console, Panel
+from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.os import internet_manager
 
 
 # Logic class

StreamingCommunity/{Src/Lib → Lib}/Downloader/TOR/downloader.py

@@ -8,9 +8,9 @@ import logging
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.color import Colors
-from StreamingCommunity.Src.Util.os import internet_manager
-from StreamingCommunity.Src.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.color import Colors
+from StreamingCommunity.Util.os import internet_manager
+from StreamingCommunity.Util._jsonConfig import config_manager
 
 
 # External libraries

StreamingCommunity/{Src/Lib → Lib}/Driver/driver_1.py

@@ -10,7 +10,7 @@ from seleniumbase import Driver
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util._jsonConfig import config_manager
+from StreamingCommunity.Util._jsonConfig import config_manager
 
 
 # Config

StreamingCommunity/{Src/Lib → Lib}/FFmpeg/capture.py

@@ -7,8 +7,8 @@ import subprocess
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.console import console
-from StreamingCommunity.Src.Util.os import internet_manager
+from StreamingCommunity.Util.console import console
+from StreamingCommunity.Util.os import internet_manager
 
 
 # Variable

StreamingCommunity/{Src/Lib → Lib}/FFmpeg/command.py

@@ -8,9 +8,9 @@ from typing import List, Dict
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util._jsonConfig import config_manager
-from StreamingCommunity.Src.Util.os import os_manager, suppress_output
-from StreamingCommunity.Src.Util.console import console
+from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.os import os_manager, suppress_output
+from StreamingCommunity.Util.console import console
 from .util import need_to_force_to_ts, check_duration_v_a
 from .capture import capture_ffmpeg_real_time
 from ..M3U8 import M3U8_Codec

StreamingCommunity/{Src/Lib → Lib}/FFmpeg/util.py

@@ -9,7 +9,7 @@ from typing import Tuple
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.console import console
+from StreamingCommunity.Util.console import console
 
 
 def has_audio_stream(video_path: str) -> bool:

StreamingCommunity/{Src/Lib → Lib}/M3U8/decryptor.py

@@ -1,13 +1,14 @@
 # 03.04.24
 
 import sys
+import time
 import logging
 import subprocess
 import importlib.util
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.console import console
+from StreamingCommunity.Util.console import console
 
 
 # Check if Crypto module is installed
@@ -17,8 +18,8 @@ crypto_installed = crypto_spec is not None
 
 if crypto_installed:
     logging.info("Decrypy use: Crypto")
-    from Crypto.Cipher import AES # type: ignore
-    from Crypto.Util.Padding import unpad # type: ignore
+    from Crypto.Cipher import AES               # type: ignore
+    from Crypto.Util.Padding import unpad       # type: ignore
 
     class M3U8_Decryption:
         """
@@ -34,12 +35,20 @@ if crypto_installed:
                 - method (str): The encryption method.
             """
             self.key = key
-            if "0x" in str(iv):
+            self.iv = iv
+            if "0x" in str(iv): 
                 self.iv = bytes.fromhex(iv.replace("0x", ""))
-            else:
-                self.iv = iv
             self.method = method
-            logging.info(f"Decrypt add: ('key': {self.key}, 'iv': {self.iv}, 'method': {self.method})")
+
+            # Precreate cipher based on encryption method
+            if self.method == "AES":
+                self.cipher = AES.new(self.key, AES.MODE_ECB)
+            elif self.method == "AES-128":
+                self.cipher = AES.new(self.key[:16], AES.MODE_CBC, iv=self.iv)
+            elif self.method == "AES-128-CTR":
+                self.cipher = AES.new(self.key[:16], AES.MODE_CTR, nonce=self.iv)
+            else:
+                raise ValueError("Invalid or unsupported method")
 
         def decrypt(self, ciphertext: bytes) -> bytes:
             """
@@ -51,23 +60,34 @@ if crypto_installed:
             Returns:
                 bytes: The decrypted content.
             """
-            if self.method == "AES":
-                cipher = AES.new(self.key, AES.MODE_ECB)
-                decrypted_data = cipher.decrypt(ciphertext)
-                return unpad(decrypted_data, AES.block_size)
-
-            elif self.method == "AES-128":
-                cipher = AES.new(self.key[:16], AES.MODE_CBC, iv=self.iv)
-                decrypted_data = cipher.decrypt(ciphertext)
-                return unpad(decrypted_data, AES.block_size)
+            start = time.perf_counter_ns()
 
+            # Decrypt based on encryption method
+            if self.method in {"AES", "AES-128"}:
+                decrypted_data = self.cipher.decrypt(ciphertext)
+                decrypted_content = unpad(decrypted_data, AES.block_size)
+                
             elif self.method == "AES-128-CTR":
-                cipher = AES.new(self.key[:16], AES.MODE_CTR, nonce=self.iv)
-                return cipher.decrypt(ciphertext)
-
+                decrypted_content = self.cipher.decrypt(ciphertext)
             else:
                 raise ValueError("Invalid or unsupported method")
 
+            end = time.perf_counter_ns() 
+
+            # Calculate elapsed time with high precision
+            elapsed_nanoseconds = end - start
+            elapsed_milliseconds = elapsed_nanoseconds / 1_000_000
+            elapsed_seconds = elapsed_nanoseconds / 1_000_000_000
+
+            # Print performance metrics
+            logging.info(f"[Crypto Decryption Performance]")
+            logging.info(f"Method: {self.method}")
+            logging.info(f"Decryption Time: {elapsed_milliseconds:.4f} ms ({elapsed_seconds:.6f} s)")
+            logging.info(f"Decrypted Content Length: {len(decrypted_content)} bytes")
+
+            return decrypted_content
+
+
 else:
 
     # Check if openssl command is available
@@ -95,10 +115,9 @@ else:
                 - method (str): The encryption method.
             """
             self.key = key
-            if "0x" in str(iv):
+            self.iv = iv
+            if "0x" in str(iv): 
                 self.iv = bytes.fromhex(iv.replace("0x", ""))
-            else:
-                self.iv = iv
             self.method = method
             logging.info(f"Decrypt add: ('key': {self.key}, 'iv': {self.iv}, 'method': {self.method})")
 
@@ -112,6 +131,9 @@ else:
             Returns:
                 bytes: The decrypted content.
             """
+            start = time.perf_counter_ns()
+
+            # Construct OpenSSL command based on encryption method
             if self.method == "AES":
                 openssl_cmd = f'openssl enc -d -aes-256-ecb -K {self.key.hex()} -nosalt'
             elif self.method == "AES-128":
@@ -122,8 +144,21 @@ else:
                 raise ValueError("Invalid or unsupported method")
 
             try:
-                decrypted_data = subprocess.check_output(openssl_cmd.split(), input=ciphertext, stderr=subprocess.STDOUT)
+                decrypted_content = subprocess.check_output(openssl_cmd.split(), input=ciphertext, stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError as e:
                 raise ValueError(f"Decryption failed: {e.output.decode()}")
 
-            return decrypted_data
+            end = time.perf_counter_ns()
+
+            # Calculate elapsed time with high precision
+            elapsed_nanoseconds = end - start
+            elapsed_milliseconds = elapsed_nanoseconds / 1_000_000
+            elapsed_seconds = elapsed_nanoseconds / 1_000_000_000
+
+            # Print performance metrics
+            logging.info(f"[OpenSSL Decryption Performance]")
+            logging.info(f"Method: {self.method}")
+            logging.info(f"Decryption Time: {elapsed_milliseconds:.4f} ms ({elapsed_seconds:.6f} s)")
+            logging.info(f"Decrypted Content Length: {len(decrypted_content)} bytes")
+
+            return decrypted_content

StreamingCommunity/{Src/Lib → Lib}/M3U8/estimator.py

@@ -13,9 +13,9 @@ from tqdm import tqdm
 
 
 # Internal utilities
-from StreamingCommunity.Src.Util.color import Colors
-from StreamingCommunity.Src.Util.os import internet_manager
-from StreamingCommunity.Src.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.color import Colors
+from StreamingCommunity.Util.os import internet_manager
+from StreamingCommunity.Util._jsonConfig import config_manager
 
 
 # Variable
@@ -65,18 +65,21 @@ class M3U8_Ts_Estimator:
             try:
                 io_counters = psutil.net_io_counters()
                 return io_counters
+            
             except Exception as e:
                 logging.warning(f"Unable to access network I/O counters: {e}")
                 return None
 
         while True:
             old_value = get_network_io()
+
             if old_value is None:  # If psutil is not available, continue with default values
                 time.sleep(interval)
                 continue
 
             time.sleep(interval)
             new_value = get_network_io()
+            
             if new_value is None:  # Handle again if psutil fails in the next call
                 time.sleep(interval)
                 continue

StreamingCommunity/{Src/Lib → Lib}/M3U8/parser.py

@@ -6,7 +6,7 @@ import logging
 
 # Internal utilities
 from m3u8 import loads
-from StreamingCommunity.Src.Util.os import internet_manager
+from StreamingCommunity.Util.os import internet_manager
 
 
 # External libraries

StreamingCommunity/{Src/Lib → Lib}/TMBD/tmdb.py

@@ -11,7 +11,7 @@ from rich.console import Console
 
 # Internal utilities
 from .obj_tmbd import Json_film
-from StreamingCommunity.Src.Util.table import TVShowManager
+from StreamingCommunity.Util.table import TVShowManager
 
 
 # Variable

StreamingCommunity/{Src/Upload → Upload}/update.py

@@ -1,12 +1,13 @@
 # 01.03.2023
 
 import os
+import sys
 import time
 
 
 # Internal utilities
 from .version import __version__, __author__, __title__
-from StreamingCommunity.Src.Util.console import console
+from StreamingCommunity.Util.console import console
 
 
 # External library
@@ -14,7 +15,10 @@ import httpx
 
 
 # Variable
-main = os.path.abspath(os.path.dirname(__file__))
+if getattr(sys, 'frozen', False):  # Modalità PyInstaller
+    base_path = os.path.join(sys._MEIPASS, "StreamingCommunity")
+else:
+    base_path = os.path.dirname(__file__)
 
 
 def update():

StreamingCommunity/{Src/Upload → Upload}/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = 'v1.8.0'
+__version__ = 'v1.9.0'
 __author__ = 'Lovi-0'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2024'