From 7671a9442c7d8ace55cf6cfdc9f3be4bd2304312 Mon Sep 17 00:00:00 2001 From: dirkf Date: Wed, 14 Oct 2020 11:55:03 +0000 Subject: [PATCH] Simplify modified subtitle handling --- youtube_dl/extractor/bbc.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py index 754516b6a..d41271ee5 100644 --- a/youtube_dl/extractor/bbc.py +++ b/youtube_dl/extractor/bbc.py @@ -351,7 +351,7 @@ class BBCCoUkIE(InfoExtractor): def _download_media_selector(self, programme_id): last_exception = None formats = [] - subtitles = [] + subtitles = None # as some mediaselectors may be parseable but have # no formats (eg captions only), try all possible # mediaselectors @@ -364,12 +364,10 @@ class BBCCoUkIE(InfoExtractor): formats += formatsAndSubtitles[0] # subtitles subtitles (a dict {(lang,sttl)}) if formatsAndSubtitles[1]: - if not subtitles: - subtitles = formatsAndSubtitles[1] - else: + if subtitles: # prioritise the first sttl for each lang formatsAndSubtitles[1].update(subtitles) - subtitles = formatsAndSubtitles[1] + subtitles = formatsAndSubtitles[1] except BBCCoUkIE.MediaSelectionError as e: if e.id in ('notukerror', 'geolocation', 'selectionunavailable'): last_exception = e