Develop * 2

Author: Arrowar

StreamingCommunity/Api/Service/altadefinizione/film.py

@@ -72,8 +72,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, select_title.date) + extension_output
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, title_name.replace(extension_output, ""))
+    title_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, title_name.replace(f".{extension_output}", ""))
 
     # Download the film using the m3u8 playlist, and output filename
     hls_process = HLS_Downloader(

StreamingCommunity/Api/Service/crunchyroll/film.py

@@ -43,8 +43,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, select_title.date) + extension_output
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(extension_output, ""))
+    mp4_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(f".{extension_output}", ""))
 
     # Generate mpd and license URLs
     url_id = select_title.get('url').split('/')[-1]

StreamingCommunity/Api/Service/hd4me/film.py

@@ -56,8 +56,8 @@ def download_film(select_title: MediaItem) -> str:
         return None
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, title_name.replace(extension_output, ""))
+    mp4_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(f".{extension_output}", ""))
 
     # Download the film using the mega downloader
     mega = MEGA_Downloader(choose_files=True)
@@ -68,6 +68,6 @@ def download_film(select_title: MediaItem) -> str:
 
     output_path = mega.download_url(
         url=mega_link,
-        dest_path=os.path.join(mp4_path, title_name)
+        dest_path=os.path.join(mp4_path, mp4_name)
     )
     return output_path

StreamingCommunity/Api/Service/mediasetinfinity/film.py

@@ -40,8 +40,8 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
     console.print(f"\n[yellow]Download: [red]{site_constants.SITE_NAME} → [cyan]{select_title.name} \n")
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, title_name.replace(extension_output, ""))
+    mp4_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(f".{extension_output}", ""))
 
     # Get playback URL and tracking info
     playback_json = get_playback_url(select_title.id)
@@ -54,7 +54,7 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
     dash_process =  DASH_Downloader(
         license_url=license_url,
         mpd_url=mpd_url,
-        output_path=os.path.join(mp4_path, title_name),
+        output_path=os.path.join(mp4_path, mp4_name),
     )
     dash_process.parse_manifest(custom_headers=get_headers())
 

StreamingCommunity/Api/Service/raiplay/film.py

@@ -47,8 +47,8 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
     master_playlist = VideoSource.extract_m3u8_url(first_item_path)
 
     # Define the filename and path for the downloaded film
-    mp4_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(extension_output, ""))
+    mp4_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(f".{extension_output}", ""))
 
     # HLS
     if ".mpd" not in master_playlist:

StreamingCommunity/Api/Service/streamingcommunity/film.py

@@ -49,13 +49,13 @@ def download_film(select_title: MediaItem) -> str:
         return None
 
     # Define the filename and path for the downloaded film
-    title_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, title_name.replace(extension_output, ""))
+    mp4_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(f".{extension_output}", ""))
 
     # Download the film using the m3u8 playlist, and output filename
     hls_process = HLS_Downloader(
         m3u8_url=master_playlist,
-        output_path=os.path.join(mp4_path, title_name)
+        output_path=os.path.join(mp4_path, mp4_name)
     ).start()
 
     if hls_process['error'] is not None:

StreamingCommunity/Api/Service/tubitv/film.py

@@ -68,8 +68,8 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
         return None, True
 
     # Define the filename and path for the downloaded film
-    mp4_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
-    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(extension_output, ""))
+    mp4_name = f"{os_manager.get_sanitize_file(select_title.name, select_title.date)}.{extension_output}"
+    mp4_path = os.path.join(site_constants.MOVIE_FOLDER, mp4_name.replace(f".{extension_output}", ""))
 
     # HLS Download
     r_proc = HLS_Downloader(

StreamingCommunity/Lib/DASH/segments.py

@@ -144,7 +144,6 @@ async def download_segments(self, output_dir: str = None, concurrent_downloads:
             worker_type = 'video' if 'Video' in description else 'audio'
             concurrent_downloads = self._get_worker_count(worker_type)
 
-        print("")
         progress_bar = tqdm(
             total=len(segment_urls) + 1,
             desc=f"Downloading {rep_id}",

StreamingCommunity/Lib/HLS/downloader.py

@@ -195,7 +195,7 @@ def select_streams(self):
             # 3. Filters are configured (not empty)
             if not self.audio_streams and all_audio and DOWNLOAD_SPECIFIC_AUDIO:
                 first_audio_lang = all_audio[0].get('language', 'unknown')
-                console.print(f"[yellow]Auto-selecting first available audio track: {first_audio_lang}")
+                #console.print(f"[yellow]Auto-selecting first available audio track: {first_audio_lang}")
                 self.audio_streams = [all_audio[0]]
 
             # Subtitle selection

StreamingCommunity/Lib/HLS/segments.py

@@ -176,7 +176,7 @@ def get_info(self) -> None:
             response.raise_for_status()
 
             self.parse_data(response.text)
-            with open(os.path.join(self.tmp_folder, "playlist.m3u8"), "w") as f:
+            with open(os.path.join(self.tmp_folder, "playlist.m3u8"), "w", encoding='utf-8') as f:
                 f.write(response.text)
 
     def _throttled_progress_update(self, content_size: int, progress_bar: tqdm):
@@ -467,7 +467,10 @@ async def download_segments_async(self, description: str, type: str):
 
             # NOT DRM
             else:
-                #print(self.segment_init_url, self.segments[0])
+                if len(self.segments) == 0:
+                    console.print("[red]No segments found to download.")
+                    return self._generate_results(type)
+                
                 decrypted_file, kill = MP4_Downloader(
                     url = self.segments[0],
                     path=os.path.join(self.tmp_folder, f"{type}_decrypted.mp4"),