StreamingCommunity 3.2.5__py3-none-any.whl → 3.2.7__py3-none-any.whl

StreamingCommunity/Api/Site/altadefinizione/film.py

@@ -12,10 +12,9 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
-from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
 
 
@@ -25,6 +24,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.supervideo import VideoSource
 
 

StreamingCommunity/Api/Site/altadefinizione/series.py

@@ -11,7 +11,6 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
 
 
@@ -29,6 +28,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.supervideo import VideoSource
 
 

StreamingCommunity/Api/Site/animeunity/serie.py

@@ -12,7 +12,6 @@ from rich.prompt import Prompt
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import MP4_downloader
 from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
 
 
@@ -24,6 +23,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import MP4_downloader
 from StreamingCommunity.Api.Player.vixcloud import VideoSourceAnime
 
 

StreamingCommunity/Api/Site/animeworld/film.py

@@ -9,7 +9,6 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import MP4_downloader
 
 
 # Logic class
@@ -19,6 +18,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import MP4_downloader
 from StreamingCommunity.Api.Player.sweetpixel import VideoSource
 
 

StreamingCommunity/Api/Site/animeworld/serie.py

@@ -1,7 +1,6 @@
 # 11.03.24
 
 import os
-import logging
 from typing import Tuple
 
 
@@ -13,7 +12,6 @@ from rich.prompt import Prompt
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import MP4_downloader
 
 
 # Logic class
@@ -24,6 +22,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import MP4_downloader
 from StreamingCommunity.Api.Player.sweetpixel import VideoSource
 
 

StreamingCommunity/Api/Site/cb01new/film.py

@@ -10,7 +10,6 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 
 
 # Logic class
@@ -19,6 +18,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.maxstream import VideoSource
 
 

StreamingCommunity/Api/Site/crunchyroll/film.py

@@ -9,11 +9,9 @@ from rich.console import Console
 
 
 # Internal utilities
-from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.os import get_wvd_path
-from StreamingCommunity.Lib.Downloader.DASH.downloader import DASH_Download
+from StreamingCommunity.Util.os import os_manager, get_wvd_path
 
 
 # Logic class
@@ -22,6 +20,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import DASH_Downloader
 from .util.get_license import get_playback_session, get_auth_token, generate_device_id
 
 
@@ -55,7 +54,7 @@ def download_film(select_title: MediaItem) -> str:
     query_params = parse_qs(parsed_url.query)
 
     # Download the episode
-    r_proc = DASH_Download(
+    r_proc = DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url='https://www.crunchyroll.com/license/v1/license/widevine',
         mpd_url=mpd_url,

StreamingCommunity/Api/Site/crunchyroll/series.py

@@ -12,13 +12,11 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Util.os import os_manager
-from StreamingCommunity.Util.os import get_wvd_path
-from StreamingCommunity.Lib.Downloader.DASH.downloader import DASH_Download
+from StreamingCommunity.Util.os import os_manager, get_wvd_path
 
 
 # Logic class
-from .util.ScrapeSerie import GetSerieInfo
+from .util.ScrapeSerie import GetSerieInfo, delete_stream_episode
 from StreamingCommunity.Api.Template.Util import (
     manage_selection, 
     map_episode_title,
@@ -31,6 +29,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import DASH_Downloader
 from .util.get_license import get_playback_session, get_auth_token, generate_device_id
 
 
@@ -65,12 +64,14 @@ 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()
-    mpd_url, mpd_headers = get_playback_session(get_auth_token(device_id), device_id, url_id)
+    token_mpd = get_auth_token(device_id)
+    
+    mpd_url, mpd_headers = get_playback_session(token_mpd, device_id, url_id)
     parsed_url = urlparse(mpd_url)
     query_params = parse_qs(parsed_url.query)
 
     # Download the episode
-    r_proc = DASH_Download(
+    r_proc = DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url='https://www.crunchyroll.com/license/v1/license/widevine',
         mpd_url=mpd_url,
@@ -95,6 +96,9 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         try: os.remove(status['path'])
         except Exception: pass
 
+    # Delete episode stream
+    delete_stream_episode(url_id, query_params['playbackGuid'][0], mpd_headers)
+
     return status['path'], status['stopped']
 
 def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, download_all: bool = False, episode_selection: str = None) -> None:

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

@@ -45,6 +45,26 @@ 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):

StreamingCommunity/Api/Site/guardaserie/series.py

@@ -1,7 +1,6 @@
 # 13.06.24
 
 import os
-import logging
 from typing import Tuple
 
 
@@ -12,7 +11,6 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 
 
 # Logic class
@@ -30,6 +28,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 # Player
 from .util.ScrapeSerie import GetSerieInfo
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.supervideo import VideoSource
 
 

StreamingCommunity/Api/Site/mediasetinfinity/film.py

@@ -12,7 +12,6 @@ from rich.console import Console
 from StreamingCommunity.Util.os import os_manager, get_wvd_path
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Lib.Downloader.DASH.downloader import DASH_Download
 
 
 # Logic class
@@ -22,6 +21,7 @@ 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
 
 
@@ -48,14 +48,23 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
 
     # Generate mpd and license URLs
     bearer = get_bearer_token()
-    playback_json = get_playback_url(bearer, select_title.url.split('_')[-1])
+
+    # Extract ID from the episode URL
+    episode_id = select_title.url.split('_')[-1]
+    if "http" in episode_id:
+        try: episode_id = select_title.url.split('/')[-1]
+        except Exception:
+            console.print(f"[red]Error:[/red] Failed to parse episode ID from URL: {select_title.url}")
+            return None, True
+
+    playback_json = get_playback_url(bearer, episode_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'])
 
     # Download the episode
-    r_proc =  DASH_Download(
+    r_proc =  DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url=license_url,
         mpd_url=mpd_url,

StreamingCommunity/Api/Site/mediasetinfinity/series.py

@@ -10,11 +10,9 @@ from rich.prompt import Prompt
 
 
 # Internal utilities
-from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.os import get_wvd_path
-from StreamingCommunity.Lib.Downloader.DASH.downloader import DASH_Download
+from StreamingCommunity.Util.message import start_message
+from StreamingCommunity.Util.os import os_manager, get_wvd_path
 
 
 # Logic class
@@ -32,6 +30,7 @@ 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
 
 
@@ -65,14 +64,23 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Generate mpd and license URLs
     bearer = get_bearer_token()
-    playback_json = get_playback_url(bearer, obj_episode.url.split('_')[-1])
+    
+    # Extract ID from the episode URL
+    episode_id = obj_episode.url.split('_')[-1]
+    if "http" in episode_id:
+        try: episode_id = obj_episode.url.split('/')[-1]
+        except Exception:
+            console.print(f"[red]Error:[/red] Failed to parse episode ID from URL: {obj_episode.url}")
+            return None, True
+
+    playback_json = get_playback_url(bearer, episode_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'])
 
     # Download the episode
-    r_proc = DASH_Download(
+    r_proc = DASH_Downloader(
         cdm_device=get_wvd_path(),
         license_url=license_url,
         mpd_url=mpd_url,

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

@@ -71,10 +71,7 @@ def get_playback_url(BEARER_TOKEN, CONTENT_ID):
     
     json_data = {
         'contentId': CONTENT_ID,
-        'streamType': 'VOD',
-        'delivery': 'Streaming',
-        'createDevice': True,
-        'overrideAppName': 'web//mediasetplay-web/5.11.8-f16d93c',
+        'streamType': 'VOD'
     }
 
     try:

StreamingCommunity/Api/Site/raiplay/film.py

@@ -11,9 +11,8 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
-from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.message import start_message
 
 
 # Logic class
@@ -22,6 +21,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.mediapolisvod import VideoSource
 
 

StreamingCommunity/Api/Site/raiplay/series.py

@@ -11,7 +11,7 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
+
 
 # Logic class
 from .util.ScrapeSerie import GetSerieInfo
@@ -27,6 +27,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.mediapolisvod import VideoSource
 
 

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -10,7 +10,6 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
 
 
@@ -20,6 +19,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -11,15 +11,14 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
 
+
 # Logic class
 from .util.ScrapeSerie import GetSerieInfo
 from StreamingCommunity.Api.Template.Util import (
     manage_selection, 
     map_episode_title, 
-    dynamic_format_number, 
     validate_selection, 
     validate_episode_selection, 
     display_episodes_list
@@ -29,6 +28,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 

StreamingCommunity/Api/Site/streamingwatch/film.py

@@ -10,7 +10,6 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Lib.Downloader import HLS_Downloader
 
 
 # Logic class
@@ -19,6 +18,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
+from StreamingCommunity import HLS_Downloader
 from StreamingCommunity.Api.Player.hdplayer import VideoSource
 
 

StreamingCommunity/Lib/Downloader/DASH/downloader.py

@@ -2,12 +2,14 @@
 
 import os
 import shutil
+
+
+# External libraries
 from rich.console import Console
 
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.os import os_manager
 from StreamingCommunity.Lib.FFmpeg.command import join_audios, join_video
 
 
@@ -19,17 +21,16 @@ from .cdm_helpher import get_widevine_keys
 
 
 # Config
-ENABLE_AUDIO = config_manager.get_bool('M3U8_DOWNLOAD', 'download_audio')
 DOWNLOAD_SPECIFIC_AUDIO = config_manager.get_list('M3U8_DOWNLOAD', 'specific_list_audio')
-CLEANUP_TMP = config_manager.get_bool('M3U8_DOWNLOAD', 'cleanup_tmp_folder')
 FILTER_CUSTOM_REOLUTION = str(config_manager.get('M3U8_PARSER', 'force_resolution')).strip().lower()
+CLEANUP_TMP = config_manager.get_bool('M3U8_DOWNLOAD', 'cleanup_tmp_folder')
 
 
 # Variable
 console = Console()
 
 
-class DASH_Download:
+class DASH_Downloader:
     def __init__(self, cdm_device, license_url, mpd_url, output_path):
         self.cdm_device = cdm_device
         self.license_url = license_url
@@ -69,17 +70,14 @@ class DASH_Download:
         )
         self.selected_video = selected_video
 
-        # Audio info (only if enabled)
-        if ENABLE_AUDIO:
-            selected_audio, list_available_audio_langs, filter_custom_audio, downloadable_audio = self.parser.select_audio(DOWNLOAD_SPECIFIC_AUDIO)
-            console.print(
-                f"[cyan bold]Audio    [/cyan bold] [green]Available:[/green] [purple]{', '.join(list_available_audio_langs)}[/purple] | "
-                f"[red]Set:[/red] [purple]{filter_custom_audio}[/purple] | "
-                f"[yellow]Downloadable:[/yellow] [purple]{downloadable_audio}[/purple]"
-            )
-            self.selected_audio = selected_audio
-        else:
-            self.selected_audio = None
+        # Audio info 
+        selected_audio, list_available_audio_langs, filter_custom_audio, downloadable_audio = self.parser.select_audio(DOWNLOAD_SPECIFIC_AUDIO)
+        console.print(
+            f"[cyan bold]Audio    [/cyan bold] [green]Available:[/green] [purple]{', '.join(list_available_audio_langs)}[/purple] | "
+            f"[red]Set:[/red] [purple]{filter_custom_audio}[/purple] | "
+            f"[yellow]Downloadable:[/yellow] [purple]{downloadable_audio}[/purple]"
+        )
+        self.selected_audio = selected_audio
 
     def get_representation_by_type(self, typ):
         if typ == "video":

StreamingCommunity/Lib/Downloader/DASH/parser.py

@@ -61,7 +61,7 @@ class MPDParser:
         self.base_url = mpd_url.rsplit('/', 1)[0] + '/'
 
     def parse(self, custom_headers):
-        response = httpx.get(self.mpd_url, headers=custom_headers, timeout=max_timeout, follow_redirects=True)
+        response = httpx.get(self.mpd_url, headers=custom_headers, timeout=max_timeout)
         response.raise_for_status()
 
         root = ET.fromstring(response.content)

StreamingCommunity/Lib/Downloader/HLS/downloader.py

@@ -17,7 +17,7 @@ from rich.panel import Panel
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.os import compute_sha1_hash, os_manager, internet_manager
+from StreamingCommunity.Util.os import os_manager, internet_manager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
 
@@ -33,11 +33,9 @@ from .segments import M3U8_Segments
 
 
 # Config
-ENABLE_AUDIO = config_manager.get_bool('M3U8_DOWNLOAD', 'download_audio')
 ENABLE_SUBTITLE = config_manager.get_bool('M3U8_DOWNLOAD', 'download_subtitle')
 DOWNLOAD_SPECIFIC_AUDIO = config_manager.get_list('M3U8_DOWNLOAD', 'specific_list_audio')
 DOWNLOAD_SPECIFIC_SUBTITLE = config_manager.get_list('M3U8_DOWNLOAD', 'specific_list_subtitles')
-MERGE_AUDIO = config_manager.get_bool('M3U8_DOWNLOAD', 'merge_audio')
 MERGE_SUBTITLE = config_manager.get_bool('M3U8_DOWNLOAD', 'merge_subs')
 CLEANUP_TMP = config_manager.get_bool('M3U8_DOWNLOAD', 'cleanup_tmp_folder')
 FILTER_CUSTOM_REOLUTION = str(config_manager.get('M3U8_PARSER', 'force_resolution')).strip().lower()
@@ -65,6 +63,7 @@ class HLSClient:
             Response content/text or None if all retries fail
         """
         client = httpx.Client(headers=self.headers, timeout=MAX_TIMEOUT, follow_redirects=True)
+
         for attempt in range(RETRY_LIMIT):
             try:
                 response = client.get(url)
@@ -95,11 +94,6 @@ class PathManager:
         Ensures output path is valid and follows expected format.
         Creates a hash-based filename if no path is provided.
         """
-        if not path:
-            root = config_manager.get('OUT_FOLDER', 'root_path')
-            hash_name = compute_sha1_hash(self.m3u8_url) + ".mp4"
-            return os.path.join(root, "undefined", hash_name)
-
         if not path.endswith(".mp4"):
             path += ".mp4"
 
@@ -171,12 +165,11 @@ class M3U8Manager:
                 logging.error("Resolution not recognized.")
                 self.video_url, self.video_res = self.parser._video.get_best_uri()
 
-            self.audio_streams = []
-            if ENABLE_AUDIO:
-                self.audio_streams = [
-                    s for s in (self.parser._audio.get_all_uris_and_names() or [])
-                    if s.get('language') in DOWNLOAD_SPECIFIC_AUDIO
-                ]
+            # Audio info
+            self.audio_streams = [
+                s for s in (self.parser._audio.get_all_uris_and_names() or [])
+                if s.get('language') in DOWNLOAD_SPECIFIC_AUDIO
+            ]
 
             self.sub_streams = []
             if ENABLE_SUBTITLE:
@@ -308,8 +301,8 @@ class DownloadManager:
         Downloads all selected streams (video, audio, subtitles).
         """
         return_stopped = False
-
         video_file = os.path.join(self.temp_dir, 'video', '0.ts')
+        
         if not os.path.exists(video_file):
             if self.download_video(video_url):
                 if not return_stopped:
@@ -374,7 +367,7 @@ class MergeManager:
             )
 
         else:
-            if MERGE_AUDIO and self.audio_streams:
+            if self.audio_streams:
                 audio_tracks = [{
                     'path': os.path.join(self.temp_dir, 'audio', a['language'], '0.ts'),
                     'name': a['language']