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

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

@@ -10,7 +10,6 @@ from functools import partial
 
 
 # External libraries
-import httpx
 from tqdm import tqdm
 from rich.console import Console
 from rich.prompt import Prompt
@@ -19,6 +18,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 +83,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://')):
@@ -110,7 +110,8 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     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))

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": {

StreamingCommunity/TelegramHelp/telegram_bot.py

@@ -9,7 +9,6 @@ import uuid
 import json
 import threading
 import subprocess
-import threading
 from typing import Optional
 
 # External libraries
@@ -305,7 +304,7 @@ class TelegramBot:
 
     def handle_get_id(self, message):
         if not self.is_authorized(message.from_user.id):
-            print(f" Non sei autorizzato.")
+            print(" Non sei autorizzato.")
             self.bot.send_message(message.chat.id, " Non sei autorizzato.")
             return
 
@@ -384,7 +383,7 @@ class TelegramBot:
 
     def handle_list_scripts(self, message):
         if not self.is_authorized(message.from_user.id):
-            print(f" Non sei autorizzato.")
+            print(" Non sei autorizzato.")
             self.bot.send_message(message.chat.id, " Non sei autorizzato.")
             return
 
@@ -395,7 +394,7 @@ class TelegramBot:
             scripts_data = []
 
         if not scripts_data:
-            print(f" Nessuno script registrato.")
+            print(" Nessuno script registrato.")
             self.bot.send_message(message.chat.id, " Nessuno script registrato.")
             return
 
@@ -437,7 +436,7 @@ class TelegramBot:
 
     def handle_stop_script(self, message):
         if not self.is_authorized(message.from_user.id):
-            print(f" Non sei autorizzato.")
+            print(" Non sei autorizzato.")
             self.bot.send_message(message.chat.id, " Non sei autorizzato.")
             return
 
@@ -452,7 +451,7 @@ class TelegramBot:
             running_scripts = [s for s in scripts_data if s["status"] == "running"]
 
             if not running_scripts:
-                print(f" Nessuno script attivo da fermare.")
+                print(" Nessuno script attivo da fermare.")
                 self.bot.send_message(
                     message.chat.id, " Nessuno script attivo da fermare."
                 )
@@ -526,7 +525,7 @@ class TelegramBot:
     def handle_screen_status(self, message):
         command_parts = message.text.split()
         if len(command_parts) < 2:
-            print(f" ID mancante nel comando. Usa: /screen <ID>")
+            print(" ID mancante nel comando. Usa: /screen <ID>")
             self.bot.send_message(
                 message.chat.id, " ID mancante nel comando. Usa: /screen <ID>"
             )
@@ -557,9 +556,9 @@ class TelegramBot:
             return
 
         if not os.path.exists(temp_file):
-            print(f" Impossibile catturare l'output della screen.")
+            print(" Impossibile catturare l'output della screen.")
             self.bot.send_message(
-                message.chat.id, f" Impossibile catturare l'output della screen."
+                message.chat.id, " Impossibile catturare l'output della screen."
             )
             return
 
@@ -669,7 +668,7 @@ class TelegramBot:
                 return response
             time.sleep(1)
 
-        print(f" Timeout: nessuna risposta ricevuta.")
+        print(" Timeout: nessuna risposta ricevuta.")
         for chat_id in self.authorized_users:  # Manda a tutti gli ID autorizzati
             self.bot.send_message(chat_id, " Timeout: nessuna risposta ricevuta.")
         self.request_manager.clear_file()

StreamingCommunity/Upload/version.py

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