From 91bc57e4c527f918c7735d67f4bceb3cf1e2332c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Mon, 17 Apr 2017 00:33:47 +0700 Subject: [PATCH] [limelight] Add support for channels and channels lists embedded using LimelightEmbeddedPlayerFlash (#12761) --- youtube_dl/extractor/limelight.py | 8 ++++---- 1 file 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[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): ]+class=(["\'])(?:(?!\1).)*\bLimelightEmbeddedPlayerFlash\b(?:(?!\1).)*\1[^>]*>.*? ]+ name=(["\'])flashVars\2[^>]+ - value=(["\'])(?:(?!\3).)*mediaId=(?P[a-z0-9]{32}) + value=(["\'])(?:(?!\3).)*(?Pmedia|channel(?:List)?)Id=(?P[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):