From e2d5f1cba698635af66a70cf114ac806713f83cd Mon Sep 17 00:00:00 2001 From: Vyacheslav Karpukhin Date: Thu, 28 May 2020 23:23:55 +0200 Subject: [PATCH 1/2] Added subtitles support for NDR extractor --- youtube_dl/extractor/ndr.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py index 2447c812e..0cdbd012b 100644 --- a/youtube_dl/extractor/ndr.py +++ b/youtube_dl/extractor/ndr.py @@ -239,6 +239,8 @@ class NDREmbedBaseIE(InfoExtractor): 'preference': quality_key(thumbnail.get('quality')), }) + subs = {it['srclang']: [{'url': urljoin(url, it['src']), 'ext': 'ttml'}] for it in config.get('tracks', [])} + return { 'id': video_id, 'title': title, @@ -248,6 +250,7 @@ class NDREmbedBaseIE(InfoExtractor): 'duration': duration, 'thumbnails': thumbnails, 'formats': formats, + 'subtitles': subs, } From 123519c3282c068e25ef40c7756f4fe652809313 Mon Sep 17 00:00:00 2001 From: Vyacheslav Karpukhin Date: Fri, 29 May 2020 00:54:05 +0200 Subject: [PATCH 2/2] NDR subtitles: fixed compatibility with python 2.6, ensured that errors are non-fatal --- youtube_dl/extractor/ndr.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py index 0cdbd012b..2de7b1606 100644 --- a/youtube_dl/extractor/ndr.py +++ b/youtube_dl/extractor/ndr.py @@ -239,7 +239,11 @@ class NDREmbedBaseIE(InfoExtractor): 'preference': quality_key(thumbnail.get('quality')), }) - subs = {it['srclang']: [{'url': urljoin(url, it['src']), 'ext': 'ttml'}] for it in config.get('tracks', [])} + try: + subs = dict((it['srclang'], [{'url': urljoin(url, it['src']), 'ext': 'ttml'}]) for it in config['tracks']) + except Exception as e: + subs = {} + self.report_warning("Extracting subtitles resulted in an error: " + str(e), video_id) return { 'id': video_id,