Bumv v3.4.0

* Improve M3U8_CONVERSION

* Swtich to client

* Ruff fix

* Fix memory * 2

* PR 3.4.0 (ADDED year in movie filename) (#414)

* Improve M3U8_CONVERSION

* Improve M3U8_CONVERSION

* ADDED year in film filename

* Update domains.json

* Update domains.json

* Fix missing newline in domains.json

Add missing newline at the end of domains.json

* Add http_client for hls downloader

* Fix download_subtitle

* fix ruff

* Remove ms

* Add default value

---------

Co-authored-by: carellice <[email protected]>

Author: Arrowar

GUI/config.json

@@ -32,7 +32,6 @@
         "specific_list_audio": [
             "ita"
         ],
-        "download_subtitle": true,
         "merge_subs": true,
         "specific_list_subtitles": [
             "ita",

README.md

@@ -146,7 +146,6 @@ mpd_url = "https://example.com/stream.mpd"
 license_url = "https://example.com/get_license"
 
 dash_process = DASH_Downloader(
-    cdm_device=get_wvd_path(),
     license_url=license_url,
     mpd_url=mpd_url,
     output_path="output.mp4",
@@ -231,7 +230,6 @@ To enable qBittorrent integration, follow the setup guide [here](https://github.
         "specific_list_audio": [
             "ita"
         ],
-        "download_subtitle": true,
         "merge_subs": true,
         "specific_list_subtitles": [
             "ita",    // Specify language codes or use ["*"] to download all available subtitles

StreamingCommunity/Api/Player/hdplayer.py

@@ -9,13 +9,8 @@
 # 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
 
 
-# Variable
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
-REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
-
 
 class VideoSource:
     def __init__(self):

StreamingCommunity/Api/Player/mediapolisvod.py

@@ -1,21 +1,12 @@
 # 11.04.25
 
 
-# External libraries
-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")
-REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
-
 class VideoSource:
-   
     @staticmethod
     def extract_m3u8_url(video_url: str) -> str:
         """Extract the m3u8 streaming URL from a RaiPlay video URL."""
@@ -29,7 +20,7 @@ def extract_m3u8_url(video_url: str) -> str:
                 return "Error: Unable to determine video JSON URL"
 
         try:
-            response = httpx.get(video_url, headers=get_headers(), timeout=MAX_TIMEOUT, verify=REQUEST_VERIFY)
+            response = create_client(headers=get_headers()).get(video_url)
             if response.status_code != 200:
                 return f"Error: Failed to fetch video data (Status: {response.status_code})"
 
@@ -50,8 +41,8 @@ def extract_m3u8_url(video_url: str) -> str:
                 'cont': element_key,
                 'output': '62',
             }
-            stream_response = httpx.get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params, headers=get_headers(), timeout=MAX_TIMEOUT, verify=REQUEST_VERIFY)
-            
+
+            stream_response = create_client(headers=get_headers()).get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params)
             if stream_response.status_code != 200:
                 return f"Error: Failed to fetch stream URL (Status: {stream_response.status_code})"
 

StreamingCommunity/Api/Player/supervideo.py

@@ -7,19 +7,13 @@
 # External libraries
 import jsbeautifier
 from bs4 import BeautifulSoup
-from curl_cffi import requests
 
 
 # Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client_curl
 from StreamingCommunity.Util.headers import get_headers
 
 
-# Variable
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
-REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
-
-
 class VideoSource:
     def __init__(self, url: str) -> None:
         """
@@ -42,10 +36,11 @@ def make_request(self, url: str) -> str:
             - str: The response content if successful, None otherwise.
         """
         try:
-            response = requests.get(url, headers=self.headers, timeout=MAX_TIMEOUT, impersonate="chrome136", verify=REQUEST_VERIFY)
+            response = create_client_curl(headers=self.headers).get(url)
             if response.status_code >= 400:
                 logging.error(f"Request failed with status code: {response.status_code}")
                 return None
+            
             return response.text
 
         except Exception as e:

StreamingCommunity/Api/Player/sweetpixel.py

@@ -3,19 +3,11 @@
 import logging
 
 
-# External libraries
-
-
 # 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
 
 
-# Variable
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
-REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
-
 class VideoSource:
     def __init__(self, site_url, episode_data, session_id, csrf_token):
         """Initialize the VideoSource with session details, episode data, and URL."""
@@ -44,4 +36,4 @@ def get_playlist(self):
 
         except Exception as e:
             logging.error(f"Error in new API system: {e}")
-            return None
+            return None

StreamingCommunity/Api/Player/vixcloud.py

@@ -6,21 +6,18 @@
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 from rich.console import Console
 
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client
 from .Helper.Vixcloud.util import WindowVideo, WindowParameter, StreamsCollection
 from .Helper.Vixcloud.js_parser import JavaScriptParser
 
 
 # Variable
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
-REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
 console = Console()
 
 
@@ -57,7 +54,7 @@ def get_iframe(self, episode_id: int) -> None:
             }
 
         try:
-            response = httpx.get(f"{self.url}/iframe/{self.media_id}", headers=self.headers, params=params, timeout=MAX_TIMEOUT, verify=REQUEST_VERIFY)
+            response = create_client(headers=self.headers).get(f"{self.url}/iframe/{self.media_id}", params=params)
             response.raise_for_status()
 
             # Parse response with BeautifulSoup to get iframe source
@@ -100,7 +97,7 @@ def get_content(self) -> None:
         """
         try:
             if self.iframe_src is not None:
-                response = httpx.get(self.iframe_src, headers=self.headers, timeout=MAX_TIMEOUT, verify=REQUEST_VERIFY)
+                response = create_client(headers=self.headers).get(self.iframe_src)
                 response.raise_for_status()
 
                 # Parse response with BeautifulSoup to get content
@@ -110,14 +107,6 @@ def get_content(self) -> None:
                 # Parse script to get video information
                 self.parse_script(script_text=script)
 
-        except httpx.HTTPStatusError as e:
-            if e.response.status_code == 404:
-                console.print("[yellow]This content will be available soon![/yellow]")
-                return
-            
-            logging.error(f"Error getting content: {e}")
-            raise
-
         except Exception as e:
             logging.error(f"Error getting content: {e}")
             raise
@@ -178,15 +167,15 @@ def get_embed(self, episode_id: int):
             str: Parsed script content
         """
         try:
-            response = httpx.get(f"{self.url}/embed-url/{episode_id}", headers=self.headers, timeout=MAX_TIMEOUT, verify=REQUEST_VERIFY)
+            response = create_client(headers=self.headers).get(f"{self.url}/embed-url/{episode_id}")
             response.raise_for_status()
 
             # Extract and clean embed URL
             embed_url = response.text.strip()
             self.iframe_src = embed_url
 
             # Fetch video content using embed URL
-            video_response = httpx.get(embed_url, verify=REQUEST_VERIFY)
+            video_response = create_client(headers=self.headers).get(embed_url)
             video_response.raise_for_status()
 
             # Parse response with BeautifulSoup to get content of the scriot

StreamingCommunity/Api/Site/altadefinizione/film.py

@@ -15,7 +15,7 @@
 from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
+from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession
 
 
 # Logic class
@@ -44,18 +44,6 @@ def download_film(select_title: MediaItem) -> str:
     Return:
         - str: output path if successful, otherwise None
     """
-    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()
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
@@ -93,7 +81,7 @@ def download_film(select_title: MediaItem) -> str:
     master_playlist = video_source.get_playlist()
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.name) + extension_output
+    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

StreamingCommunity/Api/Site/altadefinizione/site.py

@@ -2,14 +2,14 @@
 
 
 # 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
 
@@ -46,12 +46,7 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.post(
-            search_url, 
-            headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout, 
-            follow_redirects=True
-        )
+        response = create_client(headers={'user-agent': get_userAgent()}).get(search_url)
         response.raise_for_status()
 
     except Exception as e:

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

@@ -4,20 +4,15 @@
 
 
 # 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.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, url):
         """
@@ -34,7 +29,7 @@ def collect_season(self) -> None:
         """
         Retrieve all episodes for all seasons
         """
-        response = httpx.get(self.url, headers=self.headers)
+        response = create_client(headers=self.headers).get(self.url)
         soup = BeautifulSoup(response.text, "html.parser")
         self.series_name = soup.find("title").get_text(strip=True).split(" - ")[0]