df/youtube-dl
1
0
Fork 0
Code Issues Pull Requests 2 Releases 2 Wiki Activity

Try all possible mediaselectors even if one succeeds #1

Open
df wants to merge 4 commits from df-bbc-multi-mediaselector-patch into Hummy
pull from: df-bbc-multi-mediaselector-patch
merge into: df:Hummy
Conversation 0 Commits 4 Files Changed 1 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be50054bb6 - Show all commits

8
youtube_dl/extractor/bbc.py
View File

@ -350,6 +350,8 @@ class BBCCoUkIE(InfoExtractor):
def _download_media_selector(self, programme_id):
last_exception = None
formats = []
subtitles = None
for mediaselector_url in self._MEDIASELECTOR_URLS:
try:
formatsAndSubtitles = self._download_media_selector_url(
@ -359,12 +361,10 @@ class BBCCoUkIE(InfoExtractor):
formats += formatsAndSubtitles[0]
# subtitles (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