aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-01-10 05:36:03 +0700
committerSergey M․ <dstftw@gmail.com>2018-01-10 05:39:57 +0700
commit2b4e1ace4ac422acbe63be2f8cc23429de6812b8 (patch)
treef8cc0a7f166d0fc321ebe765acce02cf352285d8
parent310ea4661ddaea002c86d0ebbf4663b6c943b8f4 (diff)
downloadyoutube-dl-2b4e1ace4ac422acbe63be2f8cc23429de6812b8.zip
youtube-dl-2b4e1ace4ac422acbe63be2f8cc23429de6812b8.tar.gz
youtube-dl-2b4e1ace4ac422acbe63be2f8cc23429de6812b8.tar.bz2
[limelight] Tolerate empty pc formats (closes #15150, closes #15151, closes #15207)
-rw-r--r--youtube_dl/extractor/limelight.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/youtube_dl/extractor/limelight.py b/youtube_dl/extractor/limelight.py
index ad65b27..2803d7e 100644
--- a/youtube_dl/extractor/limelight.py
+++ b/youtube_dl/extractor/limelight.py
@@ -10,6 +10,7 @@ from ..utils import (
float_or_none,
int_or_none,
smuggle_url,
+ try_get,
unsmuggle_url,
ExtractorError,
)
@@ -220,6 +221,12 @@ class LimelightBaseIE(InfoExtractor):
'subtitles': subtitles,
}
+ def _extract_info_helper(self, pc, mobile, i, metadata):
+ return self._extract_info(
+ try_get(pc, lambda x: x['playlistItems'][i]['streams'], list) or [],
+ try_get(mobile, lambda x: x['mediaList'][i]['mobileUrls'], list) or [],
+ metadata)
+
class LimelightMediaIE(LimelightBaseIE):
IE_NAME = 'limelight'
@@ -282,10 +289,7 @@ class LimelightMediaIE(LimelightBaseIE):
'getMobilePlaylistByMediaId', 'properties',
smuggled_data.get('source_url'))
- return self._extract_info(
- pc['playlistItems'][0].get('streams', []),
- mobile['mediaList'][0].get('mobileUrls', []) if mobile else [],
- metadata)
+ return self._extract_info_helper(pc, mobile, 0, metadata)
class LimelightChannelIE(LimelightBaseIE):
@@ -326,10 +330,7 @@ class LimelightChannelIE(LimelightBaseIE):
'media', smuggled_data.get('source_url'))
entries = [
- self._extract_info(
- pc['playlistItems'][i].get('streams', []),
- mobile['mediaList'][i].get('mobileUrls', []) if mobile else [],
- medias['media_list'][i])
+ self._extract_info_helper(pc, mobile, i, medias['media_list'][i])
for i in range(len(medias['media_list']))]
return self.playlist_result(entries, channel_id, pc['title'])