StreamingCommunity 3.2.8__py3-none-any.whl → 3.3.0__py3-none-any.whl

StreamingCommunity/Lib/Downloader/DASH/cdm_helpher.py

@@ -2,7 +2,6 @@
 
 import base64
 import logging
-import os
 
 
 # External libraries
@@ -31,16 +30,11 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
         list: List of dicts {'kid': ..., 'key': ...} (only CONTENT keys) or None if error.
     """
 
-    # Check if CDM file exists
-    if not os.path.isfile(cdm_device_path):
-        console.print(f"[bold red] CDM file not found: {cdm_device_path}[/bold red]")
-        return None
-
     # Check if PSSH is a valid base64 string
     try:
         base64.b64decode(pssh)
     except Exception:
-        console.print(f"[bold red] Invalid PSSH base64 string.[/bold red]")
+        console.print("[bold red] Invalid PSSH base64 string.[/bold red]")
         return None
 
     try:
@@ -67,7 +61,15 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
             response = httpx.post(license_url, data=challenge, headers=req_headers, content=payload)
 
             if response.status_code != 200:
-                console.print(f"[bold red]License error:[/bold red] {response.status_code}")
+                console.print(f"[bold red]License error:[/bold red] {response.status_code}, {response.text}")
+                console.print({
+                    "url": license_url,
+                    "headers": req_headers,
+                    "content": payload,
+                    "session_id": session_id.hex(),
+                    "pssh": pssh
+                })
+                
                 return None
 
             # Handle (JSON) or classic (binary) license response
@@ -77,18 +79,17 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
 
             # Check if license_data is empty
             if not license_data:
-                console.print(f"[bold red]License response is empty.[/bold red]")
+                console.print("[bold red]License response is empty.[/bold red]")
                 return None
 
             if "application/json" in content_type:
                 try:
                     
                     # Try to decode as JSON only if plausible
-                    text = response.text
                     data = None
                     try:
                         data = response.json()
-                    except Exception as e:
+                    except Exception:
                         data = None
 
                     if data and "license" in data:
@@ -118,7 +119,7 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
 
             # Check if content_keys list is empty
             if not content_keys:
-                console.print(f"[bold yellow]⚠️ No CONTENT keys found in license.[/bold yellow]")
+                console.print("[bold yellow]⚠️ No CONTENT keys found in license.[/bold yellow]")
                 return None
 
             return content_keys

StreamingCommunity/Lib/Downloader/DASH/decrypt.py

@@ -38,7 +38,7 @@ def decrypt_with_mp4decrypt(encrypted_path, kid, key, output_path=None, cleanup=
         bytes.fromhex(kid)
         bytes.fromhex(key)
     except Exception:
-        console.print(f"[bold red] Invalid KID or KEY (not hex).[/bold red]")
+        console.print("[bold red] Invalid KID or KEY (not hex).[/bold red]")
         return None
 
     if not output_path:

StreamingCommunity/Lib/Downloader/DASH/downloader.py

@@ -22,7 +22,7 @@ from .cdm_helpher import get_widevine_keys
 
 # Config
 DOWNLOAD_SPECIFIC_AUDIO = config_manager.get_list('M3U8_DOWNLOAD', 'specific_list_audio')
-FILTER_CUSTOM_REOLUTION = str(config_manager.get('M3U8_PARSER', 'force_resolution')).strip().lower()
+FILTER_CUSTOM_REOLUTION = str(config_manager.get('M3U8_CONVERSION', 'force_resolution')).strip().lower()
 CLEANUP_TMP = config_manager.get_bool('M3U8_DOWNLOAD', 'cleanup_tmp_folder')
 
 
@@ -99,28 +99,30 @@ class DASH_Downloader:
             if rep:
                 encrypted_path = os.path.join(self.encrypted_dir, f"{rep['id']}_encrypted.m4s")
 
-                downloader = MPD_Segments(
-                    tmp_folder=self.encrypted_dir,
-                    representation=rep,
-                    pssh=self.parser.pssh
-                )
-
-                try:
-                    result = downloader.download_streams()
-
-                    # Check for interruption or failure
-                    if result.get("stopped"):
-                        self.stopped = True
-                        self.error = "Download interrupted"
+                # If m4s file doesn't exist start downloading
+                if not os.path.exists(encrypted_path):
+                    downloader = MPD_Segments(
+                        tmp_folder=self.encrypted_dir,
+                        representation=rep,
+                        pssh=self.parser.pssh
+                    )
+
+                    try:
+                        result = downloader.download_streams()
+
+                        # Check for interruption or failure
+                        if result.get("stopped"):
+                            self.stopped = True
+                            self.error = "Download interrupted"
+                            return False
+                        
+                        if result.get("nFailed", 0) > 0:
+                            self.error = f"Failed segments: {result['nFailed']}"
+                            return False
+                        
+                    except Exception as ex:
+                        self.error = str(ex)
                         return False
-                    
-                    if result.get("nFailed", 0) > 0:
-                        self.error = f"Failed segments: {result['nFailed']}"
-                        return False
-                    
-                except Exception as ex:
-                    self.error = str(ex)
-                    return False
 
                 if not self.parser.pssh:
                     print("No PSSH found: segments are not encrypted, skipping decryption.")

StreamingCommunity/Lib/Downloader/DASH/parser.py

@@ -61,7 +61,7 @@ class MPDParser:
         self.base_url = mpd_url.rsplit('/', 1)[0] + '/'
 
     def parse(self, custom_headers):
-        response = httpx.get(self.mpd_url, headers=custom_headers, timeout=max_timeout)
+        response = httpx.get(self.mpd_url, headers=custom_headers, timeout=max_timeout, follow_redirects=True)
         response.raise_for_status()
 
         root = ET.fromstring(response.content)

StreamingCommunity/Lib/Downloader/DASH/segments.py

@@ -134,7 +134,7 @@ class MPD_Segments:
         
         try:
             headers = {'User-Agent': get_userAgent()}
-            response = await client.get(init_url, headers=headers)
+            response = await client.get(init_url, headers=headers, follow_redirects=True)
 
             with open(concat_path, 'wb') as outfile:
                 if response.status_code == 200:
@@ -160,7 +160,8 @@ class MPD_Segments:
                 headers = {'User-Agent': get_userAgent()}
                 for attempt in range(max_retry):
                     try:
-                        resp = await client.get(url, headers=headers)
+                        resp = await client.get(url, headers=headers, follow_redirects=True)
+
                         if resp.status_code == 200:
                             return idx, resp.content, attempt
                         else:
@@ -214,7 +215,7 @@ class MPD_Segments:
                     for attempt in range(max_retry):
                         try:
                             resp = await client.get(url, headers=headers)
-
+                            
                             if resp.status_code == 200:
                                 return idx, resp.content, attempt
                             else:

StreamingCommunity/Lib/Downloader/HLS/downloader.py

@@ -17,6 +17,7 @@ from rich.panel import Panel
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.os import os_manager, internet_manager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -38,7 +39,7 @@ DOWNLOAD_SPECIFIC_AUDIO = config_manager.get_list('M3U8_DOWNLOAD', 'specific_lis
 DOWNLOAD_SPECIFIC_SUBTITLE = config_manager.get_list('M3U8_DOWNLOAD', 'specific_list_subtitles')
 MERGE_SUBTITLE = config_manager.get_bool('M3U8_DOWNLOAD', 'merge_subs')
 CLEANUP_TMP = config_manager.get_bool('M3U8_DOWNLOAD', 'cleanup_tmp_folder')
-FILTER_CUSTOM_REOLUTION = str(config_manager.get('M3U8_PARSER', 'force_resolution')).strip().lower()
+FILTER_CUSTOM_RESOLUTION = str(config_manager.get('M3U8_CONVERSION', 'force_resolution')).strip().lower()
 RETRY_LIMIT = config_manager.get_int('REQUESTS', 'max_retry')
 MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
@@ -62,7 +63,8 @@ class HLSClient:
         Returns:
             Response content/text or None if all retries fail
         """
-        client = httpx.Client(headers=self.headers, timeout=MAX_TIMEOUT, follow_redirects=True)
+        # Use unified HTTP client (inherits timeout/verify/proxy from config)
+        client = create_client(headers=self.headers)
 
         for attempt in range(RETRY_LIMIT):
             try:
@@ -154,12 +156,12 @@ class M3U8Manager:
             self.sub_streams = []
 
         else:
-            if str(FILTER_CUSTOM_REOLUTION) == "best":
+            if str(FILTER_CUSTOM_RESOLUTION) == "best":
                 self.video_url, self.video_res = self.parser._video.get_best_uri()
-            elif str(FILTER_CUSTOM_REOLUTION) == "worst":
+            elif str(FILTER_CUSTOM_RESOLUTION) == "worst":
                 self.video_url, self.video_res = self.parser._video.get_worst_uri()
-            elif str(FILTER_CUSTOM_REOLUTION).replace("p", "").replace("px", "").isdigit():
-                resolution_value = int(str(FILTER_CUSTOM_REOLUTION).replace("p", "").replace("px", ""))
+            elif str(FILTER_CUSTOM_RESOLUTION).replace("p", "").replace("px", "").isdigit():
+                resolution_value = int(str(FILTER_CUSTOM_RESOLUTION).replace("p", "").replace("px", ""))
                 self.video_url, self.video_res = self.parser._video.get_custom_uri(resolution_value)
             else:
                 logging.error("Resolution not recognized.")
@@ -188,7 +190,7 @@ class M3U8Manager:
 
         console.print(
             f"[cyan bold]Video    [/cyan bold] [green]Available:[/green] [purple]{', '.join(list_available_resolution)}[/purple] | "
-            f"[red]Set:[/red] [purple]{FILTER_CUSTOM_REOLUTION}[/purple] | "
+            f"[red]Set:[/red] [purple]{FILTER_CUSTOM_RESOLUTION}[/purple] | "
             f"[yellow]Downloadable:[/yellow] [purple]{self.video_res[0]}x{self.video_res[1]}[/purple]"
         )
 
@@ -418,7 +420,7 @@ class HLS_Downloader:
                 - is_master: Whether the M3U8 was a master playlist
             Or raises an exception if there's an error
         """
-        console.print(f"[cyan]You can safely stop the download with [bold]Ctrl+c[bold] [cyan] \n")
+        console.print("[cyan]You can safely stop the download with [bold]Ctrl+c[bold] [cyan] \n")
         
         if TELEGRAM_BOT:
             bot = get_bot_instance()
@@ -435,7 +437,7 @@ class HLS_Downloader:
                     'stopped': False
                 }
                 if TELEGRAM_BOT:
-                    bot.send_message(f"Contenuto già scaricato!", None)
+                    bot.send_message("Contenuto già scaricato!", None)
                 return response
         
             self.path_manager.setup_directories()

StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -23,6 +23,7 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.color import Colors
 from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.config_json import config_manager
 
 
@@ -198,14 +199,7 @@ class M3U8_Segments:
             print("Signal handler must be set in the main thread")
 
     def _get_http_client(self):
-        client_params = {
-            'headers': {'User-Agent': get_userAgent()},
-            'timeout': SEGMENT_MAX_TIMEOUT,
-            'follow_redirects': True,
-            'http2': False,
-            'verify': REQUEST_VERIFY
-        }
-        return httpx.Client(**client_params)
+        return create_client(headers={'User-Agent': get_userAgent()}, follow_redirects=True)
                             
     def download_segment(self, ts_url: str, index: int, progress_bar: tqdm, backoff_factor: float = 1.1) -> None:
         """
@@ -264,7 +258,8 @@ class M3U8_Segments:
                 with self.active_retries_lock:
                     self.active_retries += 1
                 
-                sleep_time = backoff_factor * (2 ** 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)
                 

StreamingCommunity/Lib/Downloader/MP4/downloader.py

@@ -7,10 +7,10 @@ import time
 import signal
 import logging
 from functools import partial
+import threading
 
 
 # External libraries
-import httpx
 from tqdm import tqdm
 from rich.console import Console
 from rich.prompt import Prompt
@@ -19,6 +19,7 @@ from rich.panel import Panel
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.color import Colors
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.os import internet_manager, os_manager
@@ -83,7 +84,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     if os.path.exists(path):
         console.log("[red]Output file already exists.")
         if TELEGRAM_BOT:
-            bot.send_message(f"Contenuto già scaricato!", None)
+            bot.send_message("Contenuto già scaricato!", None)
         return None, False
 
     if not (url.lower().startswith('http://') or url.lower().startswith('https://')):
@@ -101,16 +102,30 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     else:
         headers['User-Agent'] = get_userAgent()
 
-    # Set interrupt handler
+    # Set interrupt handler (only in main thread). In background threads (e.g., Django), skip custom signal handling.
     temp_path = f"{path}.temp"
     interrupt_handler = InterruptHandler()
-    original_handler = signal.signal(signal.SIGINT, partial(signal_handler, interrupt_handler=interrupt_handler, original_handler=signal.getsignal(signal.SIGINT)))
+    original_handler = None
+    try:
+        if threading.current_thread() is threading.main_thread():
+            original_handler = signal.signal(
+                signal.SIGINT,
+                partial(
+                    signal_handler,
+                    interrupt_handler=interrupt_handler,
+                    original_handler=signal.getsignal(signal.SIGINT),
+                ),
+            )
+    except Exception:
+        # If setting signal handler fails (non-main thread), continue without it
+        original_handler = None
 
     # Ensure the output directory exists
     os.makedirs(os.path.dirname(path), exist_ok=True)
 
     try:
-        with httpx.Client(verify=REQUEST_VERIFY) as client:
+        # Use unified HTTP client (verify/timeout/proxy from config)
+        with create_client() as client:
             with client.stream("GET", url, headers=headers) as response:
                 response.raise_for_status()
                 total = int(response.headers.get('content-length', 0))
@@ -183,4 +198,8 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
         return None, interrupt_handler.kill_download
     
     finally:
-        signal.signal(signal.SIGINT, original_handler)
+        if original_handler is not None:
+            try:
+                signal.signal(signal.SIGINT, original_handler)
+            except Exception:
+                pass

StreamingCommunity/Lib/Downloader/TOR/downloader.py

@@ -229,7 +229,7 @@ class TOR_downloader:
                 torrent_info.num_seeds == 0 and
                 torrent_info.state in ('stalledDL', 'missingFiles', 'error')):
                 
-                self.console.print(f"[bold red]Torrent not downloadable. No seeds or peers available. Removing...[/bold red]")
+                self.console.print("[bold red]Torrent not downloadable. No seeds or peers available. Removing...[/bold red]")
                 self._remove_torrent(self.latest_torrent_hash)
                 self.latest_torrent_hash = None
                 return False
@@ -250,7 +250,7 @@ class TOR_downloader:
         """
         try:
             self.qb.torrents_delete(delete_files=delete_files, torrent_hashes=torrent_hash)
-            self.console.print(f"[yellow]Torrent removed from client[/yellow]")
+            self.console.print("[yellow]Torrent removed from client[/yellow]")
         except Exception as e:
             logging.error(f"Error removing torrent: {str(e)}")
     
@@ -356,10 +356,8 @@ class TOR_downloader:
                     
                     # Get download statistics
                     download_speed = torrent_info.dlspeed
-                    upload_speed = torrent_info.upspeed
                     total_size = torrent_info.size
                     downloaded_size = torrent_info.downloaded
-                    eta = torrent_info.eta  # eta in seconds
 
                     # Format sizes and speeds using the existing functions without modification
                     downloaded_size_str = internet_manager.format_file_size(downloaded_size)
@@ -465,5 +463,5 @@ class TOR_downloader:
         
         try:
             self.qb.auth_log_out()
-        except:
+        except Exception:
             pass

StreamingCommunity/Lib/Downloader/__init__.py

@@ -2,4 +2,12 @@
 
 from .HLS.downloader import HLS_Downloader
 from .MP4.downloader import MP4_downloader
-from .TOR.downloader import TOR_downloader
+from .TOR.downloader import TOR_downloader
+from .DASH.downloader import DASH_Downloader
+
+__all__ = [
+    "HLS_Downloader",
+    "MP4_downloader",
+    "TOR_downloader",
+    "DASH_Downloader"
+]

StreamingCommunity/Lib/FFmpeg/__init__.py

@@ -1,4 +1,13 @@
 # 18.04.24
 
 from .command import join_video, join_audios, join_subtitle
-from .util import print_duration_table, get_video_duration
+from .util import print_duration_table, get_video_duration
+
+
+__all__ = [
+    "join_video",
+    "join_audios",
+    "join_subtitle",
+    "print_duration_table",
+    "get_video_duration",
+]

StreamingCommunity/Lib/FFmpeg/command.py

@@ -1,6 +1,5 @@
 # 31.01.24
 
-import sys
 import logging
 import subprocess
 from typing import List, Dict, Tuple, Optional
@@ -110,13 +109,12 @@ def join_video(video_path: str, out_path: str, codec: M3U8_Codec = None):
     if need_to_force_to_ts(video_path):
         #console.log("[red]Force input file to 'mpegts'.")
         ffmpeg_cmd.extend(['-f', 'mpegts'])
-        vcodec = "libx264"
 
     # Insert input video path
     ffmpeg_cmd.extend(['-i', video_path])
 
     # Add output Parameters
-    if USE_CODEC and codec != None:
+    if USE_CODEC and codec is not None:
         if USE_VCODEC:
             if codec.video_codec_name: 
                 if not USE_GPU: 
@@ -162,7 +160,7 @@ def join_video(video_path: str, out_path: str, codec: M3U8_Codec = None):
             print()
 
         else:
-            console.log(f"[purple]FFmpeg [white][[cyan]Join video[white]] ...")
+            console.log("[purple]FFmpeg [white][[cyan]Join video[white]] ...")
             with suppress_output():
                 capture_ffmpeg_real_time(ffmpeg_cmd, "[cyan]Join video")
                 print()
@@ -258,7 +256,7 @@ def join_audios(video_path: str, audio_tracks: List[Dict[str, str]], out_path: s
             print()
 
         else:
-            console.log(f"[purple]FFmpeg [white][[cyan]Join audio[white]] ...")
+            console.log("[purple]FFmpeg [white][[cyan]Join audio[white]] ...")
             with suppress_output():
                 capture_ffmpeg_real_time(ffmpeg_cmd, "[cyan]Join audio")
                 print()
@@ -313,7 +311,7 @@ def join_subtitle(video_path: str, subtitles_list: List[Dict[str, str]], out_pat
             print()
 
         else:
-            console.log(f"[purple]FFmpeg [white][[cyan]Join subtitle[white]] ...")
+            console.log("[purple]FFmpeg [white][[cyan]Join subtitle[white]] ...")
             with suppress_output():
                 capture_ffmpeg_real_time(ffmpeg_cmd, "[cyan]Join subtitle")
                 print()

StreamingCommunity/Lib/FFmpeg/util.py

@@ -76,7 +76,7 @@ def get_video_duration(file_path: str) -> float:
             try:
                 return float(probe_result['format']['duration'])
             
-            except:
+            except Exception:
                 return 1
 
     except Exception as e:

StreamingCommunity/Lib/M3U8/__init__.py

@@ -3,4 +3,12 @@
 from .decryptor import M3U8_Decryption
 from .estimator import M3U8_Ts_Estimator
 from .parser import M3U8_Parser, M3U8_Codec
-from .url_fixer import M3U8_UrlFix
+from .url_fixer import M3U8_UrlFix
+
+__all__ = [
+    "M3U8_Decryption",
+    "M3U8_Ts_Estimator",
+    "M3U8_Parser",
+    "M3U8_Codec",
+    "M3U8_UrlFix"
+]

StreamingCommunity/Lib/M3U8/decryptor.py

@@ -1,7 +1,6 @@
 # 03.04.24
 
 import sys
-import time
 import logging
 import importlib.util
 
@@ -10,18 +9,23 @@ import importlib.util
 from rich.console import Console
 
 
+# Cryptodome imports 
+from Cryptodome.Cipher import AES
+from Cryptodome.Util.Padding import unpad
+
+
 # Check if Cryptodome module is installed
 console = Console()
 crypto_spec = importlib.util.find_spec("Cryptodome")
 crypto_installed = crypto_spec is not None
 
+
 if not crypto_installed:
     console.log("[red]pycryptodomex non è installato. Per favore installalo. Leggi readme.md [Requirement].")
     sys.exit(0)
 
-logging.info("[cyan]Decrypy use: Cryptodomex")
-from Cryptodome.Cipher import AES
-from Cryptodome.Util.Padding import unpad
+
+logging.info("[cyan]Decryption use: Cryptodomex")
 
 
 

StreamingCommunity/Lib/M3U8/estimator.py

@@ -121,12 +121,6 @@ class M3U8_Ts_Estimator:
             number_file_total_size = file_total_size.split(' ')[0]
             units_file_total_size = file_total_size.split(' ')[1]
             
-            # Reduce lock contention by acquiring data with minimal synchronization
-            retry_count = 0
-            if self.segments_instance:
-                with self.segments_instance.active_retries_lock:
-                    retry_count = self.segments_instance.active_retries
-            
             # Get speed data outside of any locks
             speed_data = ["N/A", ""]
             with self.lock:

StreamingCommunity/Lib/M3U8/parser.py

@@ -485,7 +485,7 @@ class M3U8_Parser:
         try:
             for playlist in m3u8_obj.playlists:
 
-                there_is_codec = not playlist.stream_info.codecs is None
+                there_is_codec = playlist.stream_info.codecs is not None
                 logging.info(f"There is coded: {there_is_codec}")
 
                 if there_is_codec:

StreamingCommunity/Lib/M3U8/url_fixer.py

@@ -33,7 +33,7 @@ class M3U8_UrlFix:
         Returns:
             str: The full URL for the specified resource.
         """
-        if self.url_playlist == None:
+        if self.url_playlist is None:
             logging.error("[M3U8_UrlFix] Cant generate full url, playlist not present")
             raise
 

StreamingCommunity/Lib/TMBD/__init__.py

@@ -1,4 +1,9 @@
 # 17.09.24
 
 from .tmdb import tmdb
-from .obj_tmbd import Json_film
+from .obj_tmbd import Json_film
+
+__all__ = [
+    "tmdb",
+    "Json_film"
+]

StreamingCommunity/TelegramHelp/config.json

@@ -2,10 +2,8 @@
     "DEFAULT": {
         "debug": false,
         "show_message": true,
-        "clean_console": true,
         "show_trending": true,
         "use_api": true,
-        "not_close": false,
         "telegram_bot": true,
         "download_site_data": true,
         "validate_github_config": true
@@ -45,9 +43,7 @@
         "use_acodec": true,
         "use_bitrate": true,
         "use_gpu": false,
-        "default_preset": "ultrafast"
-    },
-    "M3U8_PARSER": {
+        "default_preset": "ultrafast",
         "force_resolution": "Best"
     },
     "REQUESTS": {