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

StreamingCommunity/Api/Site/crunchyroll/series.py

@@ -1,8 +1,8 @@
 # 16.03.25
 
 import os
-from typing import Tuple
 from urllib.parse import urlparse, parse_qs
+from typing import Tuple
 
 
 # External library
@@ -12,7 +12,7 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Util.os import os_manager, get_wvd_path
+from StreamingCommunity.Util.os import os_manager
 
 
 # Logic class
@@ -22,7 +22,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
@@ -72,7 +73,6 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # 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,
@@ -161,20 +161,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.split("/")[-1])
-
-    # Get total number of seasons 
     seasons_count = scrape_serie.getNumberSeason()
     
-    # 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:
-        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}")
@@ -186,9 +177,6 @@ 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)

StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -1,15 +1,13 @@
 # 16.03.25
 
-import sys
-
 
 # External libraries
-from curl_cffi import requests
 from rich.console import Console
 
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client_curl
 from StreamingCommunity.Util.table import TVShowManager
 
 
@@ -23,7 +21,6 @@ from .util.get_license import CrunchyrollClient
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 def title_search(query: str) -> int:
@@ -43,13 +40,13 @@ def title_search(query: str) -> int:
     config = config_manager.get_dict("SITE_LOGIN", "crunchyroll")
     if not config.get('device_id') or not config.get('etp_rt'):
         console.print("[bold red] device_id or etp_rt is missing or empty in config.json.[/bold red]")
-        sys.exit(0)
+        raise Exception("device_id or etp_rt is missing or empty in config.json.")
 
     # Initialize Crunchyroll client
     client = CrunchyrollClient()
     if not client.start():
         console.print("[bold red] Failed to authenticate with Crunchyroll.[/bold red]")
-        sys.exit(0)
+        raise Exception("Failed to authenticate with Crunchyroll.")
 
     # Build new Crunchyroll API search URL
     api_url = "https://www.crunchyroll.com/content/v2/discover/search"
@@ -68,13 +65,7 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{api_url}")
 
     try:
-        response = requests.get(
-            api_url,
-            params=params,
-            headers=headers,
-            timeout=max_timeout,
-            impersonate="chrome136"
-        )
+        response = create_client_curl(headers=headers).get(api_url, params=params)
         response.raise_for_status()
 
     except Exception as e:

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

@@ -3,31 +3,18 @@
 import logging
 
 
-# External libraries
-from curl_cffi import requests
-
-
 # Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
+from StreamingCommunity.Util.http_client import create_client_curl
 from .get_license import CrunchyrollClient
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-
-
 def get_series_seasons(series_id, headers, params):
     """
     Fetches the seasons for a given series ID from Crunchyroll.
     """
     url = f'https://www.crunchyroll.com/content/v2/cms/series/{series_id}/seasons'
-    response = requests.get(
-        url,
-        params=params,
-        headers=headers,
-        impersonate="chrome136"
-    )
+    response = create_client_curl(headers=headers).get(url, params=params)
     return response
 
 
@@ -36,12 +23,7 @@ def get_season_episodes(season_id, headers, params):
     Fetches the episodes for a given season ID from Crunchyroll.
     """
     url = f'https://www.crunchyroll.com/content/v2/cms/seasons/{season_id}/episodes'
-    response = requests.get(
-        url,
-        params=params,
-        headers=headers,
-        impersonate="chrome136"
-    )
+    response = create_client_curl(headers=headers).get(url, params=params)
     return response
 
 
@@ -137,12 +119,8 @@ class GetSerieInfo:
             'ratings': 'true',
             'locale': 'it-IT',
         }
-        response = requests.get(
-            url,
-            params=params,
-            headers=headers,
-            impersonate="chrome136"
-        )
+        
+        response = create_client_curl(headers=headers).get(url, params=params)
 
         if response.status_code != 200:
             logging.warning(f"Failed to fetch audio locales for episode {episode_id}")

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

@@ -1,11 +1,11 @@
 # 28.07.25
 
 from typing import Tuple, List, Dict
-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_userAgent
 
 
@@ -44,17 +44,13 @@ class CrunchyrollClient:
         headers['authorization'] = f'Basic {PUBLIC_TOKEN}'
         headers['content-type'] = 'application/x-www-form-urlencoded'
         
-        response = requests.post(
-            'https://www.crunchyroll.com/auth/v1/token',
-            cookies=self._get_cookies(),
-            headers=headers,
-            data={
-                'device_id': self.device_id,
-                'device_type': 'Chrome on Windows',
-                'grant_type': 'etp_rt_cookie',
-            },
-            impersonate="chrome136"
-        )
+        data = {
+            'device_id': self.device_id,
+            'device_type': 'Chrome on Windows',
+            'grant_type': 'etp_rt_cookie',
+        }
+
+        response = create_client_curl(headers=headers).post('https://www.crunchyroll.com/auth/v1/token', cookies=self._get_cookies(), data=data)
         
         if response.status_code == 400:
             print("Error 400: Please enter a correct 'etp_rt' value in config.json. You can find the value in the request headers.")
@@ -69,14 +65,8 @@ class CrunchyrollClient:
 
     def get_streams(self, media_id: str) -> Dict:
         """Ottieni gli stream disponibili"""
-        response = requests.get(
-            f'https://www.crunchyroll.com/playback/v3/{media_id}/web/chrome/play',
-            cookies=self._get_cookies(),
-            headers=self._get_headers(),
-            params={'locale': self.locale},
-            impersonate="chrome136"
-        )
-        
+        response = create_client_curl(headers=self._get_headers()).get(f'https://www.crunchyroll.com/playback/v3/{media_id}/web/chrome/play', cookies=self._get_cookies(), params={'locale': self.locale})
+
         if response.status_code == 403:
             raise Exception("Playback is Rejected: The current subscription does not have access to this content")
         
@@ -94,12 +84,7 @@ class CrunchyrollClient:
 
     def delete_active_stream(self, media_id: str, token: str) -> bool:
         """Elimina uno stream attivo"""
-        response = requests.delete(
-            f'https://www.crunchyroll.com/playback/v1/token/{media_id}/{token}',
-            cookies=self._get_cookies(),
-            headers=self._get_headers(),
-            impersonate="chrome136"
-        )
+        response = create_client_curl(headers=self._get_headers()).delete(f'https://www.crunchyroll.com/playback/v1/token/{media_id}/{token}', cookies=self._get_cookies())
         response.raise_for_status()
         return response.status_code in [200, 204]
 

StreamingCommunity/Api/Site/guardaserie/series.py

@@ -20,7 +20,8 @@ from StreamingCommunity.Api.Template.Util import (
     dynamic_format_number, 
     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
@@ -145,19 +146,11 @@ def download_series(dict_serie: MediaItem, season_selection: str = None, episode
 
     # Create class
     scrape_serie = GetSerieInfo(dict_serie)
-
-    # Get season count
     seasons_count = scrape_serie.get_seasons_number()
-    
-    # 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:
-        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}")
@@ -169,10 +162,6 @@ def download_series(dict_serie: MediaItem, season_selection: str = None, episode
     # 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(scrape_serie, i_season, download_all=True)
         else:
-
-            # Otherwise, let the user select specific episodes for the single season
             download_episode(scrape_serie, i_season, download_all=False, episode_selection=episode_selection)

StreamingCommunity/Api/Site/guardaserie/site.py

@@ -1,13 +1,14 @@
 # 09.06.24
 
+
 # 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
 
 
@@ -20,8 +21,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:
@@ -41,15 +40,8 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(
-            search_url, 
-            headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout, 
-            follow_redirects=True, 
-            verify=False
-        )
+        response = create_client(headers={'user-agent': get_userAgent()}).get(search_url)
         response.raise_for_status()
-    
     except Exception as e:
         console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
         return 0

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

@@ -5,22 +5,18 @@ from typing import List, Dict
 
 
 # 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
 
 
 # Logic class
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-
 
 class GetSerieInfo:
     def __init__(self, dict_serie: MediaItem) -> None:
@@ -43,8 +39,7 @@ class GetSerieInfo:
             int: Number of seasons of the TV series. Returns -1 if parsing fails.
         """
         try:
-            # Make an HTTP request to the series URL
-            response = httpx.get(self.url, headers=self.headers, timeout=max_timeout, follow_redirects=True)
+            response = create_client(headers=self.headers).get(self.url)
             response.raise_for_status()
 
             # Find the seasons container
@@ -72,9 +67,7 @@ class GetSerieInfo:
             List[Dict[str, str]]: List of dictionaries containing episode information.
         """
         try:
-
-            # Make an HTTP request to the series URL
-            response = httpx.get(self.url, headers=self.headers, timeout=max_timeout, follow_redirects=True)
+            response = create_client(headers=self.headers).get(self.url)
             response.raise_for_status()
 
             # Parse HTML content of the page

StreamingCommunity/Api/Site/mediasetinfinity/film.py

@@ -9,7 +9,8 @@ from rich.console import Console
 
 
 # Internal utilities
-from StreamingCommunity.Util.os import os_manager, get_wvd_path
+from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.headers import get_headers
 
@@ -22,11 +23,12 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 # Player
 from .util.fix_mpd import get_manifest
 from StreamingCommunity import DASH_Downloader
-from .util.get_license import get_bearer_token, get_playback_url, get_tracking_info, generate_license_url
+from .util.get_license import get_playback_url, get_tracking_info, generate_license_url
 
 
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> Tuple[str, bool]:
@@ -43,21 +45,18 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
     # 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, ""))
 
-    # Generate mpd and license URLs
-    bearer = get_bearer_token()
+    # Get playback URL and tracking info
+    playback_json = get_playback_url(select_title.id)
+    tracking_info = get_tracking_info(playback_json)['videos'][0]
 
-    playback_json = get_playback_url(bearer, select_title.id)
-    tracking_info = get_tracking_info(bearer, playback_json)[0]
-
-    license_url = generate_license_url(bearer, tracking_info)
-    mpd_url = get_manifest(tracking_info['video_src'])
+    license_url = generate_license_url(tracking_info)
+    mpd_url = get_manifest(tracking_info['url'])
 
     # Download the episode
     dash_process =  DASH_Downloader(
-        cdm_device=get_wvd_path(),
         license_url=license_url,
         mpd_url=mpd_url,
         output_path=os.path.join(mp4_path, title_name),

StreamingCommunity/Api/Site/mediasetinfinity/series.py

@@ -12,7 +12,7 @@ from rich.prompt import Prompt
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Util.os import os_manager, get_wvd_path
+from StreamingCommunity.Util.os import os_manager
 
 
 # Logic class
@@ -22,7 +22,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
@@ -70,7 +71,6 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Download the episode
     dash_process = DASH_Downloader(
-        cdm_device=get_wvd_path(),
         license_url=license_url,
         mpd_url=mpd_url,
         mpd_sub_list=tracking_info['subtitles'],
@@ -149,20 +149,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()
 
-    # 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:
-        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}")
@@ -174,8 +165,6 @@ 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)

StreamingCommunity/Api/Site/mediasetinfinity/site.py

@@ -4,12 +4,11 @@ from datetime import datetime
 
 
 # External libraries
-import httpx
 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.table import TVShowManager
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
@@ -23,7 +22,6 @@ from .util.get_license import get_bearer_token
 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,15 +44,9 @@ def title_search(query: str) -> int:
         'extensions': f'{{"persistedQuery":{{"version":1,"sha256Hash":"{class_mediaset_api.getHash256()}"}}}}',
         'variables': f'{{"first":10,"property":"search","query":"{query}","uxReference":"filteredSearch"}}',
     }
+    
     try:
-        response = httpx.get(
-            search_url, 
-            headers=class_mediaset_api.generate_request_headers(), 
-            params=params,
-            timeout=max_timeout, 
-            follow_redirects=True
-        )
-
+        response = create_client(headers=class_mediaset_api.generate_request_headers()).get(search_url, params=params)
         response.raise_for_status()
     except Exception as e:
         console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
@@ -66,33 +58,25 @@ def title_search(query: str) -> int:
 
     # Process items
     for item in items:
-        item_type = "tv" if item.get("__typename") == "SeriesItem" else "film"
+        is_series = (
+            item.get("__typename") == "SeriesItem"
+            or item.get("cardLink", {}).get("referenceType") == "series"
+            or bool(item.get("seasons"))
+        )
+        item_type = "tv" if is_series else "film"
 
-        # Bastava un campo data ma no ...
-        date = item.get("year")
+        # Get date
+        date = item.get("year") or ''
         if not date:
-            updated = item.get("updated")
+            updated = item.get("updated") or item.get("r") or ''
             if updated:
                 try:
-                    date = datetime.fromisoformat(updated.replace("Z", "+00:00")).year
+                    date = datetime.fromisoformat(str(updated).replace("Z", "+00:00")).year
                 except Exception:
-                    try:
-                        timestamp_ms = int(updated)
-                        date = datetime.fromtimestamp(timestamp_ms / 1000).year
-                    except Exception:
-                        date = ""
-
-        date = item.get('year', '')
-        if not date and item.get('updated'):
-            try:
-                
-                timestamp_ms = int(item.get('updated', 0))
-                date = datetime.fromtimestamp(timestamp_ms / 1000).year
-            except (ValueError, TypeError):
-                date = ''
+                    date = ''
 
         media_search_manager.add_media({
-            "url": item.get("cardLink", "").get("value", ""),
+            "url": item.get("cardLink", {}).get("value", ""),
             "id": item.get("guid", ""),
             "name": item.get("cardTitle", "No Title"),
             "type": item_type,
@@ -100,4 +84,4 @@ def title_search(query: str) -> int:
             "date": date,
         })
 
-        return media_search_manager.get_length()
+    return media_search_manager.get_length()