Compare commits

...

4 Commits

Author SHA1 Message Date
ClosedPort22
c9b92dd4c8
Merge 44311d7126 into f2a4983df7 2024-11-13 05:25:52 +01:00
ClosedPort22
44311d7126
[SubtitleConvertor] Fix warning for when sub file is missing 2024-08-20 23:06:21 +08:00
ClosedPort22
649eaf2077
[SubtitleConvertor] Fix TTML conversion 2024-08-20 23:00:05 +08:00
ClosedPort22
e464e56115
[SubtitleConvertor] Do not attempt to convert unsupported formats 2024-08-20 19:23:25 +08:00

View File

@ -948,6 +948,8 @@ class FFmpegFixupDuplicateMoovPP(FFmpegCopyStreamPP):
class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor): class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
SUPPORTED_EXTS = MEDIA_EXTENSIONS.subtitles SUPPORTED_EXTS = MEDIA_EXTENSIONS.subtitles
_DFXP_EXTS = ('dfxp', 'ttml', 'tt')
_SUPPORTED_INPUT_EXTS = (*SUPPORTED_EXTS, *_DFXP_EXTS)
def __init__(self, downloader=None, format=None): def __init__(self, downloader=None, format=None):
super().__init__(downloader) super().__init__(downloader)
@ -966,22 +968,22 @@ def run(self, info):
sub_filenames = [] sub_filenames = []
for lang, sub in subs.items(): for lang, sub in subs.items():
if not os.path.exists(sub.get('filepath', '')): if not os.path.exists(sub.get('filepath', '')):
self.report_warning(f'Skipping embedding {lang} subtitle because the file is missing') self.report_warning(f'Skipping converting {lang} subtitle because the file is missing')
continue continue
ext = sub['ext'] ext = sub['ext']
if ext == new_ext: if ext == new_ext:
self.to_screen(f'Subtitle file for {new_ext} is already in the requested format') self.to_screen(f'Subtitle file for {new_ext} is already in the requested format')
continue continue
elif ext == 'json': elif ext not in self._SUPPORTED_INPUT_EXTS:
self.to_screen( self.to_screen(
'You have requested to convert json subtitles into another format, ' f'You have requested to convert {ext} subtitles into another format, '
'which is currently not possible') 'which is currently not possible')
continue continue
old_file = sub['filepath'] old_file = sub['filepath']
sub_filenames.append(old_file) sub_filenames.append(old_file)
new_file = replace_extension(old_file, new_ext) new_file = replace_extension(old_file, new_ext)
if ext in ('dfxp', 'ttml', 'tt'): if ext in self._DFXP_EXTS:
self.report_warning( self.report_warning(
'You have requested to convert dfxp (TTML) subtitles into another format, ' 'You have requested to convert dfxp (TTML) subtitles into another format, '
'which results in style information loss') 'which results in style information loss')