Fix Jellyfin undefined subtitle

Arrowar · Arrowar · commit 4aaa9297036d · 2025-10-26T14:49:06.000+01:00
diff --git a/StreamingCommunity/Api/Site/altadefinizione/series.py b/StreamingCommunity/Api/Site/altadefinizione/series.py
@@ -11,6 +11,7 @@
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
 
 
@@ -36,6 +37,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str,bool]:
@@ -73,7 +75,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         TelegramSession.updateScriptId(script_id, f"{scrape_serie.series_name} - S{index_season_selected} - E{index_episode_selected} - {obj_episode.name}")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
+    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.{extension_output}"
     mp4_path = os.path.join(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
 
     # Retrieve scws and if available master playlist
diff --git a/StreamingCommunity/Api/Site/crunchyroll/series.py b/StreamingCommunity/Api/Site/crunchyroll/series.py
@@ -13,6 +13,7 @@
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.os import os_manager
+from StreamingCommunity.Util.config_json import config_manager
 
 
 # Logic class
@@ -37,6 +38,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str,bool]:
@@ -61,7 +63,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.get('name')}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.get('name'))}.mp4"
+    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.get('name'))}.{extension_output}"
     mp4_path = os_manager.get_sanitize_path(os.path.join(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}"))
 
     # Generate mpd and license URLs
diff --git a/StreamingCommunity/Api/Site/guardaserie/series.py b/StreamingCommunity/Api/Site/guardaserie/series.py
@@ -11,6 +11,7 @@
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
+from StreamingCommunity.Util.config_json import config_manager
 
 
 # Logic class
@@ -36,6 +37,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scape_info_serie: GetSerieInfo) -> Tuple[str,bool]:
@@ -59,7 +61,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scap
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scape_info_serie.tv_name}[/cyan] \\ [bold magenta]{obj_episode.get('name')}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scape_info_serie.tv_name, index_season_selected, index_episode_selected, obj_episode.get('name'))}.mp4"
+    mp4_name = f"{map_episode_title(scape_info_serie.tv_name, index_season_selected, index_episode_selected, obj_episode.get('name'))}.{extension_output}"
     mp4_path = os.path.join(site_constant.SERIES_FOLDER, scape_info_serie.tv_name, f"S{index_season_selected}")
 
     # Setup video source
diff --git a/StreamingCommunity/Api/Site/mediasetinfinity/series.py b/StreamingCommunity/Api/Site/mediasetinfinity/series.py
@@ -10,6 +10,7 @@
 
 
 # Internal utilities
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_headers
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.os import os_manager
@@ -38,6 +39,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str,bool]:
@@ -60,7 +62,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
+    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.{extension_output}"
     mp4_path = os_manager.get_sanitize_path(os.path.join(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}"))
 
     # Generate mpd and license URLs
diff --git a/StreamingCommunity/Api/Site/mediasetinfinity/util/get_license.py b/StreamingCommunity/Api/Site/mediasetinfinity/util/get_license.py
@@ -134,7 +134,7 @@ def get_playback_url(CONTENT_ID):
         return playback_json
     
     except Exception as e:
-        raise RuntimeError(f"Failed to get playback URL: {e}")
+        raise RuntimeError(f"Failed to get playback URL: {e}, {resp_json if 'resp_json' in locals() else 'No response'}")
 
 def parse_smil_for_media_info(smil_xml):
     """
diff --git a/StreamingCommunity/Api/Site/raiplay/series.py b/StreamingCommunity/Api/Site/raiplay/series.py
@@ -10,6 +10,7 @@
 
 
 # Internal utilities
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_headers, get_userAgent
 from StreamingCommunity.Util.message import start_message
 
@@ -38,6 +39,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str,bool]:
@@ -60,7 +62,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path
-    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
+    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.{extension_output}"
     mp4_path = os.path.join(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
 
     # Get streaming URL
diff --git a/StreamingCommunity/Api/Site/streamingcommunity/series.py b/StreamingCommunity/Api/Site/streamingcommunity/series.py
@@ -11,6 +11,7 @@
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
 
 
@@ -36,6 +37,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo, video_source: VideoSource) -> Tuple[str,bool]:
@@ -73,7 +75,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         TelegramSession.updateScriptId(script_id, f"{scrape_serie.series_name} - S{index_season_selected} - E{index_episode_selected} - {obj_episode.name}")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
+    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.{extension_output}"
     mp4_path = os.path.join(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
 
     # Retrieve scws and if available master playlist
diff --git a/StreamingCommunity/Api/Site/streamingwatch/series.py b/StreamingCommunity/Api/Site/streamingwatch/series.py
@@ -11,6 +11,7 @@
 
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Lib.Downloader import HLS_Downloader
 
 
@@ -35,6 +36,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo) -> Tuple[str,bool]:
@@ -57,7 +59,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
+    mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.{extension_output}"
     mp4_path = os.path.join(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
 
     # Retrieve scws and if available master playlist
diff --git a/StreamingCommunity/Lib/Downloader/DASH/decrypt.py b/StreamingCommunity/Lib/Downloader/DASH/decrypt.py
@@ -13,14 +13,16 @@
 
 
 # Internal utilities
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.os import get_mp4decrypt_path
 from StreamingCommunity.Util.color import Colors
 
+
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
-# NOTE!: SAREBBE MEGLIO FARLO PER OGNI FILE DURANTE IL DOWNLOAD ... MA PER ORA LO LASCIO COSI
 def decrypt_with_mp4decrypt(type, encrypted_path, kid, key, output_path=None, cleanup=True):
     """
     Decrypt an mp4/m4s file using mp4decrypt.
@@ -51,7 +53,7 @@ def decrypt_with_mp4decrypt(type, encrypted_path, kid, key, output_path=None, cl
         return None
 
     if not output_path:
-        output_path = os.path.splitext(encrypted_path)[0] + "_decrypted.mp4"
+        output_path = os.path.splitext(encrypted_path)[0] + f"_decrypted.{extension_output}"
 
     # Get file size for progress tracking
     file_size = os.path.getsize(encrypted_path)
@@ -118,7 +120,7 @@ def monitor_output_file():
             if os.path.exists(encrypted_path):
                 os.remove(encrypted_path)
 
-            temp_dec = os.path.splitext(encrypted_path)[0] + "_decrypted.mp4"
+            temp_dec = os.path.splitext(encrypted_path)[0] + f"_decrypted.{extension_output}"
 
             # Do not delete the final output!
             if temp_dec != output_path and os.path.exists(temp_dec):
diff --git a/StreamingCommunity/Lib/Downloader/DASH/downloader.py b/StreamingCommunity/Lib/Downloader/DASH/downloader.py
@@ -41,6 +41,7 @@
 
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 class DASH_Downloader:
@@ -303,7 +304,7 @@ def download_and_decrypt(self, custom_headers=None, custom_payload=None):
                     self.current_download_type = None
 
                 # Decrypt video
-                decrypted_path = os.path.join(self.decrypted_dir, "video.mp4")
+                decrypted_path = os.path.join(self.decrypted_dir, f"video.{extension_output}")
                 result_path = decrypt_with_mp4decrypt(
                     "Video", encrypted_path, KID, KEY, output_path=decrypted_path
                 )
@@ -360,7 +361,7 @@ def download_and_decrypt(self, custom_headers=None, custom_payload=None):
                     self.current_download_type = None
 
                 # Decrypt audio
-                decrypted_path = os.path.join(self.decrypted_dir, "audio.mp4")
+                decrypted_path = os.path.join(self.decrypted_dir, f"audio.{extension_output}")
                 result_path = decrypt_with_mp4decrypt(
                     f"Audio {audio_language}", encrypted_path, KID, KEY, output_path=decrypted_path
                 )
@@ -436,7 +437,7 @@ def download_segments(self, clear=False):
                     self.current_download_type = None
             
             # NO DECRYPTION: just copy/move to decrypted folder
-            decrypted_path = os.path.join(self.decrypted_dir, "video.mp4")
+            decrypted_path = os.path.join(self.decrypted_dir, f"video.{extension_output}")
             if os.path.exists(encrypted_path) and not os.path.exists(decrypted_path):
                 shutil.copy2(encrypted_path, decrypted_path)
 
@@ -488,7 +489,7 @@ def download_segments(self, clear=False):
                     self.current_download_type = None
             
             # NO DECRYPTION: just copy/move to decrypted folder
-            decrypted_path = os.path.join(self.decrypted_dir, "audio.mp4")
+            decrypted_path = os.path.join(self.decrypted_dir, f"audio.{extension_output}")
             if os.path.exists(encrypted_path) and not os.path.exists(decrypted_path):
                 shutil.copy2(encrypted_path, decrypted_path)
                 
@@ -509,8 +510,8 @@ def finalize_output(self):
             return output_file
         
         # Definition of decrypted files
-        video_file = os.path.join(self.decrypted_dir, "video.mp4")
-        audio_file = os.path.join(self.decrypted_dir, "audio.mp4")
+        video_file = os.path.join(self.decrypted_dir, f"video.{extension_output}")
+        audio_file = os.path.join(self.decrypted_dir, f"audio.{extension_output}")
         output_file = self.original_output_path
         
         # Set the output file path for status tracking
@@ -548,7 +549,7 @@ def finalize_output(self):
             if existing_sub_tracks:
 
                 # Create temporary file for subtitle merge
-                temp_output = output_file.replace('.mp4', '_temp.mp4')
+                temp_output = output_file.replace(f'.{extension_output}', f'_temp.{extension_output}')
                 
                 try:
                     final_file = join_subtitle(
diff --git a/StreamingCommunity/Lib/Downloader/HLS/downloader.py b/StreamingCommunity/Lib/Downloader/HLS/downloader.py
@@ -483,7 +483,7 @@ def merge(self) -> tuple[str, bool]:
         if not self.audio_streams and not self.sub_streams:
             merged_file = join_video(
                 video_path=video_file,
-                out_path=os.path.join(self.temp_dir, 'video.mp4'),
+                out_path=os.path.join(self.temp_dir, f'video.{EXTENSION_OUTPUT}'),
                 codec=self.parser.codec
             )
 
@@ -501,7 +501,7 @@ def merge(self) -> tuple[str, bool]:
                         })
 
                 if existing_audio_tracks:
-                    merged_audio_path = os.path.join(self.temp_dir, 'merged_audio.mp4')
+                    merged_audio_path = os.path.join(self.temp_dir, f'merged_audio.{EXTENSION_OUTPUT}')
                     merged_file, use_shortest = join_audios(
                         video_path=video_file,
                         audio_tracks=existing_audio_tracks,
@@ -522,7 +522,7 @@ def merge(self) -> tuple[str, bool]:
                         })
 
                 if existing_sub_tracks:
-                    merged_subs_path = os.path.join(self.temp_dir, 'final.mp4')
+                    merged_subs_path = os.path.join(self.temp_dir, f'final.{EXTENSION_OUTPUT}')
                     merged_file = join_subtitle(
                         video_path=merged_file,
                         subtitles_list=existing_sub_tracks,
diff --git a/StreamingCommunity/Lib/Downloader/MP4/downloader.py b/StreamingCommunity/Lib/Downloader/MP4/downloader.py
@@ -39,6 +39,7 @@
 # Variable
 msg = Prompt()
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 class InterruptHandler:
@@ -186,12 +187,12 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
                 f"[bold green]Download completed{' (Partial)' if interrupt_handler.force_quit else ''}![/bold green]\n"
                 f"[cyan]File size: [bold red]{internet_manager.format_file_size(os.path.getsize(path))}[/bold red]\n"
                 f"[cyan]Duration: [bold]{print_duration_table(path, description=False, return_string=True)}[/bold]", 
-                title=f"{os.path.basename(path.replace('.mp4', ''))}", 
+                title=f"{os.path.basename(path.replace(f'.{extension_output}', ''))}", 
                 border_style="green"
             ))
 
             if TELEGRAM_BOT:
-                message = f"Download completato{'(Parziale)' if interrupt_handler.force_quit else ''}\nDimensione: {internet_manager.format_file_size(os.path.getsize(path))}\nDurata: {print_duration_table(path, description=False, return_string=True)}\nTitolo: {os.path.basename(path.replace('.mp4', ''))}"
+                message = f"Download completato{'(Parziale)' if interrupt_handler.force_quit else ''}\nDimensione: {internet_manager.format_file_size(os.path.getsize(path))}\nDurata: {print_duration_table(path, description=False, return_string=True)}\nTitolo: {os.path.basename(path.replace(f'.{extension_output}', ''))}"
                 clean_message = re.sub(r'\[[a-zA-Z]+\]', '', message)
                 bot.send_message(clean_message, None)
 
diff --git a/StreamingCommunity/Lib/FFmpeg/command.py b/StreamingCommunity/Lib/FFmpeg/command.py
diff --git a/config.json b/config.json
