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

StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -4,27 +4,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.headers import get_headers
+from StreamingCommunity.Util.http_client import create_client_curl
 from StreamingCommunity.Util.table import TVShowManager
 
 
 # Logic class
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
-from .util.get_license import get_auth_token, generate_device_id
+from .util.get_license import CrunchyrollClient
 
 
 # Variable
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 def title_search(query: str) -> int:
@@ -40,9 +38,16 @@ def title_search(query: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Check if x_cr_tab_id or etp_rt is present
-    if config_manager.get_dict("SITE_LOGIN", "crunchyroll")['x_cr_tab_id'] is None or config_manager.get_dict("SITE_LOGIN", "crunchyroll")['x_cr_tab_id'] == "" or config_manager.get_dict("SITE_LOGIN", "crunchyroll")['etp_rt'] is None or config_manager.get_dict("SITE_LOGIN", "crunchyroll")['etp_rt'] == "":
-        console.print("[bold red] x_cr_tab_id or etp_rt is missing or empty.[/bold red]")
+    # Check if device_id or etp_rt is present
+    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)
+
+    # Initialize Crunchyroll client
+    client = CrunchyrollClient()
+    if not client.start():
+        console.print("[bold red] Failed to authenticate with Crunchyroll.[/bold red]")
         sys.exit(0)
 
     # Build new Crunchyroll API search URL
@@ -57,19 +62,12 @@ def title_search(query: str) -> int:
         "locale": "it-IT"
     }
 
-    headers = get_headers()
-    headers['authorization'] = f"Bearer {get_auth_token(generate_device_id()).access_token}"
+    headers = client._get_headers()
 
     console.print(f"[cyan]Search url: [yellow]{api_url}")
 
     try:
-        response = requests.get(
-            api_url,
-            params=params,
-            headers=headers,
-            timeout=max_timeout,
-            impersonate="chrome110"
-        )
+        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,19 +3,10 @@
 import logging
 
 
-# External libraries
-from curl_cffi import requests
-
-
 # Internal utilities
-from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
-from .get_license import get_auth_token, generate_device_id
-
-
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
+from StreamingCommunity.Util.http_client import create_client_curl
+from .get_license import CrunchyrollClient
 
 
 def get_series_seasons(series_id, headers, params):
@@ -23,12 +14,7 @@ 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="chrome110"
-    )
+    response = create_client_curl(headers=headers).get(url, params=params)
     return response
 
 
@@ -37,34 +23,9 @@ 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="chrome110"
-    )
+    response = create_client_curl(headers=headers).get(url, params=params)
     return response
 
-def delete_stream_episode(episode_id, stream_id, headers):
-    """
-    Deletes a specific stream episode by episode ID and stream ID.
-    """
-    url = f'https://www.crunchyroll.com/playback/v1/token/{episode_id}/{stream_id}'
-    headers = get_headers()
-    
-    response = requests.delete(
-        url,
-        headers=headers,
-        impersonate="chrome110"
-    )
-    
-    if response.status_code == 204:
-        return True
-    
-    else:
-        logging.error(f"Failed to delete stream episode: {response.status_code} - {response.text}")
-        return False
-
 
 class GetSerieInfo:
     def __init__(self, series_id):
@@ -76,8 +37,13 @@ class GetSerieInfo:
         """
         self.series_id = series_id
         self.seasons_manager = SeasonManager()
-        self.headers = get_headers()
-        self.headers['authorization'] = f"Bearer {get_auth_token(generate_device_id()).access_token}"
+        
+        # Initialize Crunchyroll client
+        self.client = CrunchyrollClient()
+        if not self.client.start():
+            raise Exception("Failed to authenticate with Crunchyroll")
+        
+        self.headers = self.client._get_headers()
         self.params = {
             'force_locale': '',
             'preferred_audio_language': 'it-IT',
@@ -104,13 +70,10 @@ class GetSerieInfo:
         if seasons:
             self.series_name = seasons[0].get("series_title") or seasons[0].get("title")
 
-        for season in seasons:
-            season_num = season.get("season_number", 0)
-            season_name = season.get("title", f"Season {season_num}")
-
+        for i, season in enumerate(seasons, start=1):
             self.seasons_manager.add_season({
-                'number': season_num,
-                'name': season_name,
+                'number': i,
+                'name': season.get("title", f"Season {i}"),
                 'id': season.get('id')
             })
 
@@ -119,15 +82,10 @@ class GetSerieInfo:
         Fetch and cache episodes for a specific season number.
         """
         season = self.seasons_manager.get_season_by_number(season_number)
+        ep_response = get_season_episodes(season.id, self.headers, self.params)
 
-        if not season or getattr(season, 'id', None) is None:
-            logging.error(f"Season {season_number} not found or missing id.")
-            return []
-
-        season_id = season.id
-        ep_response = get_season_episodes(season_id, self.headers, self.params)
         if ep_response.status_code != 200:
-            logging.error(f"Failed to fetch episodes for season {season_id}")
+            logging.error(f"Failed to fetch episodes for season {season.id}")
             return []
 
         ep_data = ep_response.json()
@@ -161,12 +119,8 @@ class GetSerieInfo:
             'ratings': 'true',
             'locale': 'it-IT',
         }
-        response = requests.get(
-            url,
-            params=params,
-            headers=headers,
-            impersonate="chrome110"
-        )
+        
+        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}")
@@ -186,7 +140,6 @@ class GetSerieInfo:
                 if locale and guid:
                     audio_locales.append(locale)
                     urls_by_locale[locale] = f"https://www.crunchyroll.com/it/watch/{guid}"
-                    #print(f"Locale: {locale}, URL: {urls_by_locale[locale]}")
 
             return audio_locales, urls_by_locale
         

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

@@ -1,133 +1,124 @@
 # 28.07.25
 
-import uuid
-from dataclasses import dataclass, field
-from typing import Optional,  Dict, Any
-
-
-# External library
-from curl_cffi.requests import Session
+from typing import Tuple, List, Dict
 
 
 # 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
 
 
 # Variable
-device_id = None
-auth_basic = 'bm9haWhkZXZtXzZpeWcwYThsMHE6'
-etp_rt = config_manager.get_dict("SITE_LOGIN", "crunchyroll")['etp_rt']
-x_cr_tab_id = config_manager.get_dict("SITE_LOGIN", "crunchyroll")['x_cr_tab_id']
-
-
-@dataclass
-class Token:
-    access_token: Optional[str] = None
-    refresh_token: Optional[str] = None
-    expires_in: Optional[int] = None
-    token_type: Optional[str] = None
-    scope: Optional[str] = None
-    country: Optional[str] = None
-    account_id: Optional[str] = None
-    profile_id: Optional[str] = None
-    extra: Dict[str, Any] = field(default_factory=dict)
-
+PUBLIC_TOKEN = "bm9haWhkZXZtXzZpeWcwYThsMHE6"
 
 
-def generate_device_id():
-    global device_id
+class CrunchyrollClient:
+    def __init__(self) -> None:
+        config = config_manager.get_dict("SITE_LOGIN", "crunchyroll")
+        self.device_id = config.get('device_id')
+        self.etp_rt = config.get('etp_rt')
+        self.locale = "it-IT"
+        
+        self.access_token = None
+        self.refresh_token = None
+        self.account_id = None
 
-    if device_id is not None:
-        return device_id
+    def _get_headers(self) -> Dict:
+        headers = {
+            'user-agent': get_userAgent(),
+        }
+        if self.access_token:
+            headers['authorization'] = f'Bearer {self.access_token}'
+        return headers
     
-    device_id = str(uuid.uuid4())
-    return device_id
-
-
-def get_auth_token(device_id):
-    with Session(impersonate="chrome110") as session:
-        cookies = {
-            'etp_rt': etp_rt,
+    def _get_cookies(self) -> Dict:
+        cookies = {'device_id': self.device_id}
+        if self.etp_rt:
+            cookies['etp_rt'] = self.etp_rt
+        return cookies
+
+    def start(self) -> bool:
+        """Autorizza il client"""
+        headers = self._get_headers()
+        headers['authorization'] = f'Basic {PUBLIC_TOKEN}'
+        headers['content-type'] = 'application/x-www-form-urlencoded'
+        
+        data = {
+            'device_id': self.device_id,
+            'device_type': 'Chrome on Windows',
+            'grant_type': 'etp_rt_cookie',
         }
-        response = session.post(
-            'https://www.crunchyroll.com/auth/v1/token',
-            headers={
-                'authorization': f'Basic {auth_basic}',
-                'user-agent': get_userAgent(),
-            },
-            data={
-                'device_id': device_id,
-                'device_type': 'Chrome on Windows',
-                'grant_type': 'etp_rt_cookie',
-            },
-            cookies=cookies
-        )
+
+        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.")
+            return False
+            
+        result = response.json()
+        self.access_token = result.get('access_token')
+        self.refresh_token = result.get('refresh_token')
+        self.account_id = result.get('account_id')
+        
+        return True
 
-        # Get the JSON response
-        data = response.json()
-        known = {
-            'access_token', 'refresh_token', 'expires_in', 'token_type', 'scope',
-            'country', 'account_id', 'profile_id'
-        }
-        extra = {k: v for k, v in data.items() if k not in known}
-        return Token(
-            access_token=data.get('access_token'),
-            refresh_token=data.get('refresh_token'),
-            expires_in=data.get('expires_in'),
-            token_type=data.get('token_type'),
-            scope=data.get('scope'),
-            country=data.get('country'),
-            account_id=data.get('account_id'),
-            profile_id=data.get('profile_id'),
-            extra=extra
-        )
-
-
-def get_playback_session(token: Token, device_id: str, url_id: str):
-    """
-    Crea una sessione per ottenere i dati di playback e sottotitoli da Crunchyroll.
-    """
-    cookies = {
-        'device_id': device_id,
-        'etp_rt': etp_rt
-    }
-    headers = {
-        'authorization': f'Bearer {token.access_token}',
-        'user-agent': get_userAgent(),
-        'x-cr-tab-id': x_cr_tab_id
-    }
-
-    with Session(impersonate="chrome110") as session:
-        response = session.get(
-            f'https://www.crunchyroll.com/playback/v3/{url_id}/web/chrome/play',
-            cookies=cookies,
-            headers=headers
-        )
-
-        if (response.status_code == 403):
+    def get_streams(self, media_id: str) -> Dict:
+        """Ottieni gli stream disponibili"""
+        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")
         
-        if (response.status_code == 420):
+        if response.status_code == 420:
             raise Exception("TOO_MANY_ACTIVE_STREAMS. Wait a few minutes and try again.")
-
+        
         response.raise_for_status()
-
-        # Get the JSON response
+        
         data = response.json()
         
         if data.get('error') == 'Playback is Rejected':
             raise Exception("Playback is Rejected: Premium required")
         
-        url = data.get('url')
-        
-        subtitles = []
-        if 'subtitles' in data:
-            subtitles = [
-                {'language': lang, 'url': info['url'], 'format': info.get('format')}
-                for lang, info in data['subtitles'].items()
-            ]
-        
-        return url, headers, subtitles
+        return data
+
+    def delete_active_stream(self, media_id: str, token: str) -> bool:
+        """Elimina uno stream attivo"""
+        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]
+
+
+def get_playback_session(client: CrunchyrollClient, url_id: str) -> Tuple[str, Dict, List[Dict]]:
+    """
+    Return the playback session details including the MPD URL, headers, and subtitles.
+    
+    Parameters:
+        - client: Instance of CrunchyrollClient
+        - url_id: ID of the media to fetch
+    """
+    data = client.get_streams(url_id)
+    url = data.get('url')
+    
+    # Collect subtitles if available
+    subtitles = []
+    if 'subtitles' in data:
+        collected = []
+        for lang, info in data['subtitles'].items():
+            sub_url = info.get('url')
+
+            if not sub_url:
+                continue
+            
+            collected.append({
+                'language': lang, 
+                'url': sub_url, 
+                'format': info.get('format')
+            })
+
+        if collected:
+            subtitles = collected
+    
+    # Return the MPD URL, headers, and subtitles
+    headers = client._get_headers()
+    return url, headers, subtitles

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
@@ -70,7 +70,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'],

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}")