R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[utils] fix style id extraction for namespaced id attribute(closes #16551)

Browse Source
This commit is contained in:
Remita Amine 2018-05-26 14:35:47 +01:00
parent c0fd20abca
commit 261f47306c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/utils.py
View File

@ -2667,6 +2667,7 @@ def dfxp2srt(dfxp_data):
] ]
_x = functools.partial(xpath_with_ns, ns_map={ _x = functools.partial(xpath_with_ns, ns_map={
'xml': 'http://www.w3.org/XML/1998/namespace',
'ttml': 'http://www.w3.org/ns/ttml', 'ttml': 'http://www.w3.org/ns/ttml',
'tts': 'http://www.w3.org/ns/ttml#styling', 'tts': 'http://www.w3.org/ns/ttml#styling',
}) })
@ -2758,7 +2759,9 @@ def dfxp2srt(dfxp_data):
repeat = False repeat = False
while True: while True:
for style in dfxp.findall(_x('.//ttml:style')): for style in dfxp.findall(_x('.//ttml:style')):
style_id = style.get('id') style_id = style.get('id') or style.get(_x('xml:id'))
if not style_id:
continue
parent_style_id = style.get('style') parent_style_id = style.get('style')
if parent_style_id: if parent_style_id:
if parent_style_id not in styles: if parent_style_id not in styles: