StreamingCommunity 3.3.9__py3-none-any.whl → 3.4.0__py3-none-any.whl

StreamingCommunity/Api/Site/raiplay/util/ScrapeSerie.py

@@ -3,19 +3,12 @@
 import logging
 
 
-# External libraries
-import httpx
-
-
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-
 
 class GetSerieInfo:
     def __init__(self, path_id: str):
@@ -32,7 +25,7 @@ class GetSerieInfo:
         """Get series info including seasons."""
         try:
             program_url = f"{self.base_url}/{self.path_id}"
-            response = httpx.get(url=program_url, headers=get_headers(), timeout=max_timeout)
+            response = create_client(headers=get_headers()).get(program_url)
             
             # If 404, content is not yet available
             if response.status_code == 404:
@@ -88,8 +81,8 @@ class GetSerieInfo:
             season = self.seasons_manager.get_season_by_number(number_season)
 
             # Se stai leggendo questo codice spieami perche hai fatto cosi.
-            url = f"{self.base_url}/{self.path_id.replace(".json", "")}/{self.publishing_block_id}/{season.id}/episodes.json"
-            response = httpx.get(url=url, headers=get_headers(), timeout=max_timeout)
+            url = f"{self.base_url}/{self.path_id.replace('.json', '')}/{self.publishing_block_id}/{season.id}/episodes.json"
+            response = create_client(headers=get_headers()).get(url)
             response.raise_for_status()
             
             episodes_data = response.json()

StreamingCommunity/Api/Site/raiplay/util/get_license.py

@@ -1,20 +1,11 @@
 # 16.03.25
 
 
-# External library
-import httpx
-
-
 # Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.headers import get_headers
 
 
-# Variable
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
-
-
-
 def generate_license_url(mpd_id: str):
     """
     Generates the URL to obtain the Widevine license.
@@ -29,8 +20,8 @@ def generate_license_url(mpd_id: str):
         'cont': mpd_id,
         'output': '62',
     }
-
-    response = httpx.get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params, headers=get_headers(), timeout=MAX_TIMEOUT)
+    
+    response = create_client(headers=get_headers()).get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params)
     response.raise_for_status() 
 
     # Extract the license URL from the response in two lines

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -9,8 +9,9 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
+from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession
 
 
 # Logic class
@@ -25,6 +26,7 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> str:
@@ -38,19 +40,6 @@ def download_film(select_title: MediaItem) -> str:
     Return:
         - str: output path
     """
-    if site_constant.TELEGRAM_BOT:
-        bot = get_bot_instance()
-        bot.send_message(f"Download in corso:\n{select_title.name}", None)
-
-        # Viene usato per lo screen
-        console.print(f"## Download: [red]{select_title.name} ##")
-
-        # Get script_id
-        script_id = TelegramSession.get_session()
-        if script_id != "unknown":
-            TelegramSession.updateScriptId(script_id, select_title.name)
-
-    # Start message and display film information
     start_message()
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
@@ -67,8 +56,8 @@ def download_film(select_title: MediaItem) -> str:
         return None
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.name) + ".mp4"
-    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(".mp4", ""))
+    title_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
+    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(extension_output, ""))
 
     # Download the film using the m3u8 playlist, and output filename
     hls_process = HLS_Downloader(

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -4,14 +4,13 @@ import json
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 from rich.console import Console
 
 
 # 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.table import TVShowManager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -25,8 +24,6 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-ssl_verify = config_manager.get_bool("REQUESTS", "verify")
 
 
 def title_search(query: str) -> int:
@@ -46,13 +43,7 @@ def title_search(query: str) -> int:
     table_show_manager.clear()
 
     try:
-        response = httpx.get(
-            f"{site_constant.FULL_URL}/it", 
-            headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout,
-            verify=ssl_verify,
-	    follow_redirects=True
-        )
+        response = create_client(headers={'user-agent': get_userAgent()}).get(f"{site_constant.FULL_URL}/it")
         response.raise_for_status()
 
         soup = BeautifulSoup(response.text, 'html.parser')
@@ -66,17 +57,7 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(
-            search_url, 
-            headers = {
-                'referer': site_constant.FULL_URL,
-                'user-agent': get_userAgent(),
-                'x-inertia': 'true',
-                'x-inertia-version': version
-            },
-            timeout=max_timeout,
-            verify=ssl_verify
-        )
+        response = create_client(headers={'user-agent': get_userAgent(), 'x-inertia': 'true', 'x-inertia-version': version}).get(search_url)
         response.raise_for_status()
 
     except Exception as e:

StreamingCommunity/Api/Site/streamingcommunity/util/ScrapeSerie.py

@@ -5,21 +5,15 @@ import logging
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 
 
 # Internal utilities
-from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-ssl_verify = config_manager.get_bool("REQUESTS", "verify")
-
-
 class GetSerieInfo:
     def __init__(self, url, media_id: int = None, series_name: str = None):
         """
@@ -31,7 +25,7 @@ class GetSerieInfo:
             - series_name (str, optional): Name of the TV series
         """
         self.is_series = False
-        self.headers = {'user-agent': get_userAgent()}
+        self.headers = get_headers()
         self.url = url
         self.media_id = media_id
         self.seasons_manager = SeasonManager()
@@ -48,12 +42,7 @@ class GetSerieInfo:
             Exception: If there's an error fetching series information
         """
         try:
-            response = httpx.get(
-                url=f"{self.url}/titles/{self.media_id}-{self.series_name}",
-                headers=self.headers,
-                timeout=max_timeout,
-                verify=ssl_verify
-            )
+            response = create_client(headers=self.headers).get(f"{self.url}/titles/{self.media_id}-{self.series_name}")
             response.raise_for_status()
 
             # Extract series info from JSON response
@@ -98,17 +87,13 @@ class GetSerieInfo:
             if not season:
                 logging.error(f"Season {number_season} not found")
                 return
-            
-            response = httpx.get(
-                url=f'{self.url}/titles/{self.media_id}-{self.series_name}/season-{number_season}', 
-                headers={
-                    'User-Agent': self.headers['user-agent'],
-                    'x-inertia': 'true',
-                    'x-inertia-version': self.version,
-                },
-                timeout=max_timeout,
-                verify=ssl_verify
-            )
+
+            custom_headers = self.headers.copy()
+            custom_headers.update({
+                'x-inertia': 'true',
+                'x-inertia-version': self.version,
+            })
+            response = create_client(headers=custom_headers).get(f"{self.url}/titles/{self.media_id}-{self.series_name}/season-{number_season}")
 
             # Extract episodes from JSON response
             json_response = response.json().get('props', {}).get('loadedSeason', {}).get('episodes', [])

StreamingCommunity/Api/Site/streamingwatch/__init__.py

@@ -3,6 +3,7 @@
 import sys
 import subprocess
 
+
 # External library
 from rich.console import Console
 from rich.prompt import Prompt

StreamingCommunity/Api/Site/streamingwatch/film.py

@@ -9,6 +9,7 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.message import start_message
 
 
@@ -24,6 +25,7 @@ from StreamingCommunity.Api.Player.hdplayer import VideoSource
 
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> str:
@@ -45,8 +47,8 @@ def download_film(select_title: MediaItem) -> str:
     master_playlist = video_source.get_m3u8_url(select_title.url)
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.name) + ".mp4"
-    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(".mp4", ""))
+    title_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
+    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(extension_output, ""))
 
     # Download the film using the m3u8 playlist, and output filename
     hls_process = HLS_Downloader(

StreamingCommunity/Api/Site/streamingwatch/series.py

@@ -53,7 +53,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Get episode information
     obj_episode = scrape_serie.selectEpisode(index_season_selected, index_episode_selected-1)
-    console.print(f"\n[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
+    console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
     mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"

StreamingCommunity/Api/Site/streamingwatch/site.py

@@ -4,13 +4,12 @@ import re
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 from rich.console import Console
 
 
 # Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
 
@@ -24,18 +23,13 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 def extract_nonce() -> str:
     """Extract nonce value from the page script"""
-    response = httpx.get(
-        site_constant.FULL_URL, 
-        headers={'user-agent': get_userAgent()}, 
-        timeout=max_timeout
-    )
-    
+    response = create_client(headers={'user-agent': get_userAgent()}).get(site_constant.FULL_URL)
     soup = BeautifulSoup(response.content, 'html.parser')
+
     script = soup.find('script', id='live-search-js-extra')
     if script:
         match = re.search(r'"admin_ajax_nonce":"([^"]+)"', script.text)
@@ -73,15 +67,7 @@ def title_search(query: str) -> int:
             '_wpnonce': _wpnonce
         }
 
-        response = httpx.post(
-            search_url,
-            headers={
-                'origin': site_constant.FULL_URL,
-                'user-agent': get_userAgent()
-            },
-            data=data,
-            timeout=max_timeout
-        )
+        response = create_client(headers={'origin': site_constant.FULL_URL, 'user-agent': get_userAgent()}).post(search_url, data=data)
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'html.parser')
 

StreamingCommunity/Api/Site/streamingwatch/util/ScrapeSerie.py

@@ -11,12 +11,9 @@ from bs4 import BeautifulSoup
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.http_client import create_client
-from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager, Episode
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 class GetSerieInfo:

StreamingCommunity/Api/Template/config_loader.py

@@ -56,13 +56,6 @@ class SiteConstant:
             base_path = os.path.join(base_path, self.SITE_NAME)
         return os.path.join(base_path, config_manager.get('OUT_FOLDER', 'anime_folder_name'))
     
-    @property
-    def COOKIE(self):
-        try:
-            return config_manager.get_dict('SITE_EXTRA', self.SITE_NAME)
-        except KeyError:
-            return None
-    
     @property
     def TELEGRAM_BOT(self):
         return config_manager.get_bool('DEFAULT', 'telegram_bot')

StreamingCommunity/Lib/Downloader/DASH/decrypt.py

@@ -3,25 +3,30 @@
 import os
 import subprocess
 import logging
+import threading
+import time
 
 
 # External libraries
 from rich.console import Console
+from tqdm import tqdm
 
 
 # Internal utilities
 from StreamingCommunity.Util.os import get_mp4decrypt_path
+from StreamingCommunity.Util.color import Colors
 
 # Variable
 console = Console()
 
 
 # NOTE!: SAREBBE MEGLIO FARLO PER OGNI FILE DURANTE IL DOWNLOAD ... MA PER ORA LO LASCIO COSI
-def decrypt_with_mp4decrypt(encrypted_path, kid, key, output_path=None, cleanup=True):
+def decrypt_with_mp4decrypt(type, encrypted_path, kid, key, output_path=None, cleanup=True):
     """
     Decrypt an mp4/m4s file using mp4decrypt.
 
     Args:
+        type (str): Type of file ('video' or 'audio').
         encrypted_path (str): Path to encrypted file.
         kid (str): Hexadecimal KID.
         key (str): Hexadecimal key.
@@ -48,15 +53,63 @@ def decrypt_with_mp4decrypt(encrypted_path, kid, key, output_path=None, cleanup=
     if not output_path:
         output_path = os.path.splitext(encrypted_path)[0] + "_decrypted.mp4"
 
+    # Get file size for progress tracking
+    file_size = os.path.getsize(encrypted_path)
+    
     key_format = f"{kid.lower()}:{key.lower()}"
     cmd = [get_mp4decrypt_path(), "--key", key_format, encrypted_path, output_path]
     logging.info(f"Running command: {' '.join(cmd)}")
 
+    # Create progress bar with custom format
+    bar_format = (
+        f"{Colors.YELLOW}DECRYPT{Colors.CYAN} {type}{Colors.WHITE}: "
+        f"{Colors.MAGENTA}{{bar:40}} "
+        f"{Colors.LIGHT_GREEN}{{n_fmt}}{Colors.WHITE}/{Colors.CYAN}{{total_fmt}} "
+        f"{Colors.DARK_GRAY}[{Colors.YELLOW}{{elapsed}}{Colors.WHITE} < {Colors.CYAN}{{remaining}}{Colors.DARK_GRAY}] "
+        f"{Colors.WHITE}{{postfix}}"
+    )
+    
+    progress_bar = tqdm(
+        total=100,
+        bar_format=bar_format,
+        unit="",
+        ncols=150
+    )
+    
+    def monitor_output_file():
+        """Monitor output file growth and update progress bar."""
+        last_size = 0
+        while True:
+            if os.path.exists(output_path):
+                current_size = os.path.getsize(output_path)
+                if current_size > 0:
+                    progress_percent = min(int((current_size / file_size) * 100), 100)
+                    progress_bar.n = progress_percent
+                    progress_bar.refresh()
+                    
+                    if current_size == last_size and current_size > 0:
+                        # File stopped growing, likely finished
+                        break
+                    
+                    last_size = current_size
+            
+            time.sleep(0.1)
+    
+    # Start monitoring thread
+    monitor_thread = threading.Thread(target=monitor_output_file, daemon=True)
+    monitor_thread.start()
+
     try:
         result = subprocess.run(cmd, capture_output=True, text=True, timeout=300)
     except Exception as e:
+        progress_bar.close()
         console.print(f"[bold red] mp4decrypt execution failed: {e}[/bold red]")
         return None
+    
+    # Ensure progress bar reaches 100%
+    progress_bar.n = 100
+    progress_bar.refresh()
+    progress_bar.close()
 
     if result.returncode == 0 and os.path.exists(output_path):