Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-29 19:47:54 +01:00
Code Issues Releases Wiki Activity

Merge TTML subtitle cues with same timecodes while converting to SRT

Browse Source
This commit is contained in:
Niklas 2018-10-02 18:21:48 +02:00
parent 66d106f270
commit cbb5155060
No known key found for this signature in database
GPG Key ID: C7070AE8E74845B8
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/utils.py
View File

@ -2831,6 +2831,9 @@ def dfxp2srt(dfxp_data):
continue continue
default_style.update(style) default_style.update(style)
last_begin_time = None
last_end_time = None
for para, index in zip(paras, itertools.count(1)): for para, index in zip(paras, itertools.count(1)):
begin_time = parse_dfxp_time_expr(para.attrib.get('begin')) begin_time = parse_dfxp_time_expr(para.attrib.get('begin'))
end_time = parse_dfxp_time_expr(para.attrib.get('end')) end_time = parse_dfxp_time_expr(para.attrib.get('end'))
@ -2841,12 +2844,20 @@ def dfxp2srt(dfxp_data):
if not dur: if not dur:
continue continue
end_time = begin_time + dur end_time = begin_time + dur
out.append('%d\n%s --> %s\n%s\n\n' % (
if begin_time == last_begin_time and end_time == last_end_time:
out.append('%s\n' % (parse_node(para)))
else:
out.append('\n%d\n%s --> %s\n%s\n' % (
index, index,
srt_subtitles_timecode(begin_time), srt_subtitles_timecode(begin_time),
srt_subtitles_timecode(end_time), srt_subtitles_timecode(end_time),
parse_node(para))) parse_node(para)))
last_begin_time = begin_time
last_end_time = end_time
out.append('\n')
return ''.join(out) return ''.join(out)