aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-04-17 00:33:47 +0700
committerSergey M․ <dstftw@gmail.com>2017-04-17 00:33:47 +0700
commit91bc57e4c527f918c7735d67f4bceb3cf1e2332c (patch)
tree16a6bb3161b72012abc0589ee83b5a7ee0b99145
parente5d39886ec8e4e40b2b7257d16cc5d8505cc1f69 (diff)
[limelight] Add support for channels and channels lists embedded using LimelightEmbeddedPlayerFlash (#12761)
-rw-r--r--youtube_dl/extractor/limelight.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/limelight.py b/youtube_dl/extractor/limelight.py
index 0041453af..0a5a3956c 100644
--- a/youtube_dl/extractor/limelight.py
+++ b/youtube_dl/extractor/limelight.py
@@ -30,7 +30,6 @@ class LimelightBaseIE(InfoExtractor):
for kind, video_id in re.findall(
r'LimelightPlayer\.doLoad(Media|Channel|ChannelList)\(["\'](?P<id>[a-z0-9]{32})',
webpage):
- print('video_id', video_id)
entries.append(cls.url_result(
smuggle_url(
'limelight:%s:%s' % (lm[kind], video_id),
@@ -46,13 +45,14 @@ class LimelightBaseIE(InfoExtractor):
<object[^>]+class=(["\'])(?:(?!\1).)*\bLimelightEmbeddedPlayerFlash\b(?:(?!\1).)*\1[^>]*>.*?
<param[^>]+
name=(["\'])flashVars\2[^>]+
- value=(["\'])(?:(?!\3).)*mediaId=(?P<id>[a-z0-9]{32})
+ value=(["\'])(?:(?!\3).)*(?P<kind>media|channel(?:List)?)Id=(?P<id>[a-z0-9]{32})
''', webpage):
+ kind, video_id = mobj.group('kind'), mobj.group('id')
entries.append(cls.url_result(
smuggle_url(
- 'limelight:media:%s' % mobj.group('id'),
+ 'limelight:%s:%s' % (kind, video_id),
{'source_url': source_url}),
- 'LimelightMedia', mobj.group('id')))
+ 'Limelight%s' % kind.capitalize(), video_id))
return entries
def _call_playlist_service(self, item_id, method, fatal=True, referer=None):