Merge branch 'wdr-subtitles' of https://github.com/mrtnmtth/youtube-dl into mrtnmtth-wdr-subtitles

This commit is contained in:
Tom-Oliver Heidel 2020-09-05 19:37:36 +02:00
commit 47b9774231

View File

@ -45,9 +45,18 @@ class WDRIE(InfoExtractor):
media_resource = metadata['mediaResource'] media_resource = metadata['mediaResource']
formats = [] formats = []
subtitles = {}
# check if the metadata contains a direct URL to a file # check if the metadata contains a direct URL to a file
for kind, media_resource in media_resource.items(): for kind, media_resource in media_resource.items():
if kind == 'captionsHash':
for ext, url in media_resource.items():
subtitles.setdefault('de', []).append({
'url': url,
'ext': ext,
})
continue
if kind not in ('dflt', 'alt'): if kind not in ('dflt', 'alt'):
continue continue
@ -81,14 +90,6 @@ class WDRIE(InfoExtractor):
self._sort_formats(formats) self._sort_formats(formats)
subtitles = {}
caption_url = media_resource.get('captionURL')
if caption_url:
subtitles['de'] = [{
'url': caption_url,
'ext': 'ttml',
}]
title = tracker_data['trackerClipTitle'] title = tracker_data['trackerClipTitle']
return { return {