Fix #407 2 / 2

Author: Arrowar

.github/.site/login.md

@@ -2,25 +2,14 @@
 
 Follow the instructions below to obtain the required keys for each streaming service and add them to your `config.json`.
 
-## Crunchyroll: Get `etp_rt` and `x_cr_tab_id`
+## Crunchyroll: Get `etp_rt` and `device_id`
 
 1. **Log in** to [Crunchyroll](https://www.crunchyroll.com/).
 
 2. **Open Developer Tools** (<kbd>F12</kbd>).
 
-3. **Get `etp_rt`:**
+3. **Get `etp_rt` and `device_id`:**
    - Go to the **Application** tab.
-   - Find the `etp_rt` cookie under **Cookies** for the site.
-   - **Copy** its value for `config.json`.
-   - ![etp_rt location](./img/crunchyroll_etp_rt.png)
-   
-4. **Get `x_cr_tab_id`:**
-   - Start playing any video.
-   - Go to the **Network** tab.
-   - Filter by **XHR** requests.
-   - Select a request and find the `x-cr-tab-id` header.
-   - **Copy** its value for `config.json`.
-   - ![x_cr_tab_id location](./img/crunchyroll_x_cr_tab_id.png)
-
-</TabItem>
-</Tabs>
+   - Find the `etp_rt` and `device_id` cookies under **Cookies** for the site (you can use the filter/search field and search for `etp_rt` or `device_id`).
+   - **Copy** their values for `config.json`.
+   - ![etp_rt location](./img/crunchyroll_etp_rt.png)

StreamingCommunity/Api/Site/crunchyroll/film.py

@@ -21,7 +21,7 @@
 
 # Player
 from StreamingCommunity import DASH_Downloader
-from .util.get_license import get_playback_session, get_auth_token, generate_device_id
+from .util.get_license import get_playback_session, CrunchyrollClient
 
 
 # Variable
@@ -42,14 +42,19 @@ def download_film(select_title: MediaItem) -> str:
     start_message()
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
+    # Initialize Crunchyroll client
+    client = CrunchyrollClient()
+    if not client.start():
+        console.print("[bold red]Failed to authenticate with Crunchyroll.[/bold red]")
+        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", ""))
 
     # Generate mpd and license URLs
     url_id = select_title.get('url').split('/')[-1]
-    device_id = generate_device_id()
-    mpd_url, mpd_headers, mpd_list_sub = get_playback_session(get_auth_token(device_id), device_id, url_id)
+    mpd_url, mpd_headers, mpd_list_sub = get_playback_session(client, url_id)
     parsed_url = urlparse(mpd_url)
     query_params = parse_qs(parsed_url.query)
 
@@ -82,4 +87,9 @@ def download_film(select_title: MediaItem) -> str:
         except Exception: 
             pass
 
+    # Delete stream after download
+    token = query_params['playbackGuid'][0]
+    if token:
+        client.delete_active_stream(url_id, token)
+
     return status['path'], status['stopped']

StreamingCommunity/Api/Site/crunchyroll/series.py

@@ -16,7 +16,7 @@
 
 
 # Logic class
-from .util.ScrapeSerie import GetSerieInfo, delete_stream_episode
+from .util.ScrapeSerie import GetSerieInfo
 from StreamingCommunity.Api.Template.Util import (
     manage_selection, 
     map_episode_title,
@@ -30,7 +30,7 @@
 
 # Player
 from StreamingCommunity import DASH_Downloader
-from .util.get_license import get_playback_session, get_auth_token, generate_device_id
+from .util.get_license import get_playback_session
 
 
 # Variable
@@ -52,6 +52,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         - bool: Whether download was stopped
     """
     start_message()
+    client = scrape_serie.client
 
     # Get episode information
     obj_episode = scrape_serie.selectEpisode(index_season_selected, index_episode_selected-1)
@@ -64,10 +65,8 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Generate mpd and license URLs
     url_id = obj_episode.get('url').split('/')[-1]
-    device_id = generate_device_id()
-    token_mpd = get_auth_token(device_id)
 
-    mpd_url, mpd_headers, mpd_list_sub = get_playback_session(token_mpd, device_id, url_id)
+    mpd_url, mpd_headers, mpd_list_sub = get_playback_session(client, url_id)
     parsed_url = urlparse(mpd_url)
     query_params = parse_qs(parsed_url.query)
 
@@ -101,7 +100,9 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
             pass
 
     # Delete episode stream
-    delete_stream_episode(url_id, query_params['playbackGuid'][0], mpd_headers)
+    token = query_params['playbackGuid'][0]
+    if token:
+        client.delete_active_stream(url_id, token)
 
     return status['path'], status['stopped']
 

StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -10,14 +10,13 @@
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.headers import get_headers
 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
@@ -40,9 +39,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,8 +63,7 @@ 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}")
 

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

@@ -8,10 +8,9 @@
 
 
 # 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
+from .get_license import CrunchyrollClient
 
 
 # Variable
@@ -45,26 +44,6 @@ def get_season_episodes(season_id, headers, 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 +55,13 @@ def __init__(self, series_id):
         """
         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',
@@ -186,7 +170,6 @@ def _get_episode_audio_locales_and_urls(self, episode_id):
                 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