StreamingCommunity 3.3.9__tar.gz → 3.4.2__tar.gz

{streamingcommunity-3.3.9/StreamingCommunity.egg-info → streamingcommunity-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.3.9
+Version: 3.4.2
 Home-page: https://github.com/Arrowar/StreamingCommunity
 Author: Arrowar
 Project-URL: Bug Reports, https://github.com/Arrowar/StreamingCommunity/issues
@@ -182,7 +182,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",
@@ -267,7 +266,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-3.3.9 → streamingcommunity-3.4.2}/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-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Player/hdplayer.py

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

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/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 @@ class VideoSource:
                 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 @@ class VideoSource:
                 '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-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Player/supervideo.py

@@ -7,19 +7,13 @@ import logging
 # 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 @@ class VideoSource:
             - 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-3.3.9 → streamingcommunity-3.4.2}/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 @@ class VideoSource:
 
         except Exception as e:
             logging.error(f"Error in new API system: {e}")
-            return None
+            return None

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Player/vixcloud.py

@@ -6,21 +6,18 @@ from urllib.parse import urlparse, parse_qs, urlencode, urlunparse
 
 
 # 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 @@ class VideoSource:
             }
 
         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 @@ class VideoSource:
         """
         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 @@ class VideoSource:
                 # 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,7 +167,7 @@ class VideoSourceAnime(VideoSource):
             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
@@ -186,7 +175,7 @@ class VideoSourceAnime(VideoSource):
             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-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/film.py

@@ -15,7 +15,7 @@ from StreamingCommunity.Util.headers import get_headers
 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
@@ -30,7 +30,7 @@ from StreamingCommunity.Api.Player.supervideo import VideoSource
 
 # Variable
 console = Console()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> str:
@@ -43,18 +43,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")
     
@@ -92,8 +80,8 @@ 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) + ".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-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/series.py

@@ -21,7 +21,8 @@ from StreamingCommunity.Api.Template.Util import (
     map_episode_title,
     validate_selection, 
     validate_episode_selection, 
-    display_episodes_list
+    display_episodes_list,
+    display_seasons_list
 )
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
@@ -151,16 +152,11 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         - episode_selection (str, optional): Pre-defined episode selection that bypasses manual input
     """
     scrape_serie = GetSerieInfo(select_season.url)
-
-    # Get total number of seasons 
     seasons_count = scrape_serie.getNumberSeason()
     
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
 
-    # Prompt user for season selection and download episodes
-    console.print(f"\n[green]Seasons found: [red]{seasons_count}")
-
     # If season_selection is provided, use it instead of asking for input
     if season_selection is None:
         if site_constant.TELEGRAM_BOT:
@@ -180,10 +176,7 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
             )
 
         else:
-            index_season_selected = msg.ask(
-                "\n[cyan]Insert season number [yellow](e.g., 1), [red]* [cyan]to download all seasons, "
-                "[yellow](e.g., 1-2) [cyan]for a range of seasons, or [yellow](e.g., 3-*) [cyan]to download from a specific season to the end"
-            )
+            index_season_selected = display_seasons_list(scrape_serie.seasons_manager)
     else:
         index_season_selected = season_selection
         console.print(f"\n[cyan]Using provided season selection: [yellow]{season_selection}")
@@ -195,10 +188,8 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     # Loop through the selected seasons and download episodes
     for i_season in list_season_select:
         if len(list_season_select) > 1 or index_season_selected == "*":
-            # Download all episodes if multiple seasons are selected or if '*' is used
             download_episode(i_season, scrape_serie, download_all=True)
         else:
-            # Otherwise, let the user select specific episodes for the single season
             download_episode(i_season, scrape_serie, download_all=False, episode_selection=episode_selection)
 
     if site_constant.TELEGRAM_BOT:

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/site.py

@@ -2,14 +2,13 @@
 
 
 # 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
 
@@ -23,7 +22,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")
 
 
 def title_search(query: str) -> int:
@@ -46,12 +44,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-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/util/ScrapeSerie.py

@@ -4,20 +4,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.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 @@ class GetSerieInfo:
         """
         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]
 

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeunity/site.py

@@ -1,15 +1,15 @@
 # 10.12.23
 
-# External libraries
 import urllib.parse
-import httpx
-from curl_cffi import requests
+
+
+# External libraries
 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_curl
 from StreamingCommunity.Util.table import TVShowManager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -18,21 +18,18 @@ from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
+
+# Variable
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 def get_token(user_agent: str) -> dict:
     """
     Retrieve session cookies from the site.
     """
-    response = requests.get(
-        site_constant.FULL_URL,
-        headers={'user-agent': user_agent},
-        impersonate="chrome120"
-    )
+    response = create_client_curl(headers={'user-agent': user_agent}).get(site_constant.FULL_URL)
     response.raise_for_status()
     all_cookies = {name: value for name, value in response.cookies.items()}
 
@@ -80,13 +77,7 @@ def title_search(query: str) -> int:
 
     # First call: /livesearch
     try:
-        response1 = httpx.post(
-            f'{site_constant.FULL_URL}/livesearch',
-            cookies=cookies,
-            headers=headers,
-            json={'title': query},
-            timeout=max_timeout
-        )
+        response1 = create_client_curl(headers=headers).post(f'{site_constant.FULL_URL}/livesearch', cookies=cookies, data={'title': query})
         response1.raise_for_status()
         process_results(response1.json().get('records', []), seen_titles, media_search_manager, choices)
 
@@ -107,13 +98,7 @@ def title_search(query: str) -> int:
             'dubbed': False,
             'season': False
         }
-        response2 = httpx.post(
-            f'{site_constant.FULL_URL}/archivio/get-animes',
-            cookies=cookies,
-            headers=headers,
-            json=json_data,
-            timeout=max_timeout
-        )
+        response2 = create_client_curl(headers=headers).post(f'{site_constant.FULL_URL}/archivio/get-animes', cookies=cookies, data=json_data)
         response2.raise_for_status()
         process_results(response2.json().get('records', []), seen_titles, media_search_manager, choices)
 

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeunity/util/ScrapeSerie.py

@@ -3,21 +3,12 @@
 import logging
 
 
-# External libraries
-import httpx
-
-
 # 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_curl
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import EpisodeManager, Episode
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-
-
-
 class ScrapeSerieAnime:
     def __init__(self, url: str):
         """
@@ -27,7 +18,7 @@ class ScrapeSerieAnime:
             url (str): Url of the streaming site
         """
         self.is_series = False
-        self.headers = {'user-agent': get_userAgent()}
+        self.headers = get_headers()
         self.url = url
         self.episodes_cache = None
 
@@ -61,11 +52,7 @@ class ScrapeSerieAnime:
         """
         try:
             # Get initial episode count
-            response = httpx.get(
-                url=f"{self.url}/info_api/{self.media_id}/",
-                headers=self.headers,
-                timeout=max_timeout
-            )
+            response = create_client_curl(headers=self.headers).get(f"{self.url}/info_api/{self.media_id}/")
             response.raise_for_status()
             initial_count = response.json()["episodes_count"]
             
@@ -75,18 +62,15 @@ class ScrapeSerieAnime:
             # Fetch episodes in chunks
             while start_range <= initial_count:
                 end_range = min(start_range + 119, initial_count)
+
+                params={
+                    "start_range": start_range,
+                    "end_range": end_range
+                }
                 
-                response = httpx.get(
-                    url=f"{self.url}/info_api/{self.media_id}/1",
-                    params={
-                        "start_range": start_range,
-                        "end_range": end_range
-                    },
-                    headers=self.headers,
-                    timeout=max_timeout
-                )
+                response = create_client_curl(headers=self.headers).get(f"{self.url}/info_api/{self.media_id}/1", params=params)
                 response.raise_for_status()
-                
+
                 chunk_episodes = response.json().get("episodes", [])
                 all_episodes.extend(chunk_episodes)
                 start_range = end_range + 1

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeworld/film.py

@@ -2,6 +2,7 @@
 
 import os
 
+
 # External library
 from rich.console import Console
 
@@ -44,8 +45,9 @@ def download_film(select_title: MediaItem):
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] ([cyan]{scrape_serie.get_name()}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{scrape_serie.get_name()}.mp4"
-    mp4_path = os.path.join(site_constant.ANIME_FOLDER, scrape_serie.get_name())
+    serie_name_with_year = os_manager.get_sanitize_file(scrape_serie.get_name(), select_title.date)
+    mp4_name = f"{serie_name_with_year}.mp4"
+    mp4_path = os.path.join(site_constant.ANIME_FOLDER, serie_name_with_year.replace('.mp4', ''))
 
     # Create output folder
     os_manager.create_path(mp4_path)

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeworld/site.py

@@ -2,15 +2,14 @@
 
 import logging
 
+
 # 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, get_headers
+from StreamingCommunity.Util.headers import get_headers
 from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.table import TVShowManager
 
@@ -24,7 +23,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")
 
 
 def get_session_and_csrf() -> dict:
@@ -72,13 +70,7 @@ def title_search(query: str) -> int:
 
     # Make the GET request
     try:
-        response = httpx.get(
-            search_url, 
-            headers={'User-Agent': get_userAgent()},
-            timeout=max_timeout,
-            verify=False
-        )
-
+        response = create_client(headers=get_headers()).get(search_url)
     except Exception as e:
         console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
         return 0

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeworld/util/ScrapeSerie.py

@@ -10,7 +10,6 @@ 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.Util.os import os_manager
 
 
@@ -19,8 +18,6 @@ from ..site import get_session_and_csrf
 from StreamingCommunity.Api.Player.sweetpixel import VideoSource
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 class ScrapSerie:
@@ -34,7 +31,7 @@ class ScrapSerie:
         )
 
         try:
-            self.response = self.client.get(self.url, timeout=max_timeout, follow_redirects=True)
+            self.response = self.client.get(self.url)
             self.response.raise_for_status()
 
         except Exception as e:

{streamingcommunity-3.3.9 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/crunchyroll/film.py

@@ -11,7 +11,7 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.os import os_manager, get_wvd_path
+from StreamingCommunity.Util.os import os_manager
 
 
 # Logic class
@@ -26,7 +26,7 @@ from .util.get_license import get_playback_session, CrunchyrollClient
 
 # Variable
 console = Console()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> str:
@@ -49,8 +49,8 @@ def download_film(select_title: MediaItem) -> str:
         return None, True
 
     # Define filename and path for the downloaded video
-    mp4_name = os_manager.get_sanitize_file(select_title.name) + ".mp4"
-    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, mp4_name.replace(".mp4", ""))
+    mp4_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
+    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, mp4_name.replace(extension_output, ""))
 
     # Generate mpd and license URLs
     url_id = select_title.get('url').split('/')[-1]
@@ -60,7 +60,6 @@ def download_film(select_title: MediaItem) -> str:
 
     # Download the episode
     dash_process = DASH_Downloader(
-        cdm_device=get_wvd_path(),
         license_url='https://www.crunchyroll.com/license/v1/license/widevine',
         mpd_url=mpd_url,
         mpd_sub_list=mpd_list_sub,