lopar/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 00:16:48 +00:00
Code Releases Activity

Merge 74bbdc079b into c5098961b0

Browse Source
This commit is contained in:
filip-hejsek 2024-08-21 22:33:39 -04:00 committed by GitHub
commit 29a828d588
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
youtube_dl/__init__.py
View File

@ -282,6 +282,7 @@ def _real_main(argv=None):
postprocessors.append({ postprocessors.append({
'key': 'FFmpegSubtitlesConvertor', 'key': 'FFmpegSubtitlesConvertor',
'format': opts.convertsubtitles, 'format': opts.convertsubtitles,
'ttml_convert_style': opts.ttmlconvertstyle,
}) })
if opts.embedsubtitles: if opts.embedsubtitles:
postprocessors.append({ postprocessors.append({

4
youtube_dl/options.py
View File

@ -870,6 +870,10 @@ def parseOpts(overrideArguments=None):
'--convert-subs', '--convert-subtitles', '--convert-subs', '--convert-subtitles',
metavar='FORMAT', dest='convertsubtitles', default=None, metavar='FORMAT', dest='convertsubtitles', default=None,
help='Convert the subtitles to other format (currently supported: srt|ass|vtt|lrc)') help='Convert the subtitles to other format (currently supported: srt|ass|vtt|lrc)')
postproc.add_option(
'--ttml-convert-no-style',
action='store_false', dest='ttmlconvertstyle', default=True,
help='Discard all style information when converting subtitles from ttml/dfxp')
parser.add_option_group(general) parser.add_option_group(general)
parser.add_option_group(network) parser.add_option_group(network)

5
youtube_dl/postprocessor/ffmpeg.py
View File

@ -591,9 +591,10 @@ class FFmpegFixupM3u8PP(FFmpegPostProcessor):
class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor): class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
def __init__(self, downloader=None, format=None): def __init__(self, downloader=None, format=None, ttml_convert_style=True):
super(FFmpegSubtitlesConvertorPP, self).__init__(downloader) super(FFmpegSubtitlesConvertorPP, self).__init__(downloader)
self.format = format self.format = format
self.ttml_convert_style = ttml_convert_style
def run(self, info): def run(self, info):
subs = info.get('requested_subtitles') subs = info.get('requested_subtitles')
@ -626,7 +627,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
srt_file = subtitles_filename(filename, lang, 'srt', info.get('ext')) srt_file = subtitles_filename(filename, lang, 'srt', info.get('ext'))
with open(dfxp_file, 'rb') as f: with open(dfxp_file, 'rb') as f:
srt_data = dfxp2srt(f.read()) srt_data = dfxp2srt(f.read(), self.ttml_convert_style)
with open(srt_file, 'w', encoding='utf-8') as f: with open(srt_file, 'w', encoding='utf-8') as f:
f.write(srt_data) f.write(srt_data)

6
youtube_dl/utils.py
View File

@ -4902,7 +4902,7 @@ def srt_subtitles_timecode(seconds):
return '%02d:%02d:%02d,%03d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 1000) return '%02d:%02d:%02d,%03d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 1000)
def dfxp2srt(dfxp_data): def dfxp2srt(dfxp_data, convert_style=True):
''' '''
@param dfxp_data A bytes-like object containing DFXP data @param dfxp_data A bytes-like object containing DFXP data
@returns A unicode object containing converted SRT data @returns A unicode object containing converted SRT data
@ -4944,7 +4944,7 @@ def dfxp2srt(dfxp_data):
def start(self, tag, attrib): def start(self, tag, attrib):
if tag in (_x('ttml:br'), 'br'): if tag in (_x('ttml:br'), 'br'):
self._out += '\n' self._out += '\n'
else: elif convert_style:
unclosed_elements = [] unclosed_elements = []
style = {} style = {}
element_style_id = attrib.get('style') element_style_id = attrib.get('style')
@ -4987,7 +4987,7 @@ def dfxp2srt(dfxp_data):
self._unclosed_elements.append(unclosed_elements) self._unclosed_elements.append(unclosed_elements)
def end(self, tag): def end(self, tag):
if tag not in (_x('ttml:br'), 'br'): if convert_style and tag not in (_x('ttml:br'), 'br'):
unclosed_elements = self._unclosed_elements.pop() unclosed_elements = self._unclosed_elements.pop()
for element in reversed(unclosed_elements): for element in reversed(unclosed_elements):
self._out += '</%s>' % element self._out += '</%s>' % element