From: Sergey M․ Date: Sat, 13 May 2017 23:17:34 +0000 (+0700) Subject: [extractor/generic] Remove duplicate limelight code X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=946826eec75aeb2fe0e9edc8e734b6bfd89ad7c4;p=youtube-dl [extractor/generic] Remove duplicate limelight code --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 8f9097945..dde65fa96 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -2519,29 +2519,6 @@ class GenericIE(InfoExtractor): return self.playlist_result( limelight_urls, video_id, video_title, video_description) - mobj = re.search(r'LimelightPlayer\.doLoad(Media|Channel|ChannelList)\(["\'](?P[a-z0-9]{32})', webpage) - if mobj: - lm = { - 'Media': 'media', - 'Channel': 'channel', - 'ChannelList': 'channel_list', - } - return self.url_result(smuggle_url('limelight:%s:%s' % ( - lm[mobj.group(1)], mobj.group(2)), {'source_url': url}), - 'Limelight%s' % mobj.group(1), mobj.group(2)) - - mobj = re.search( - r'''(?sx) - ]+class=(["\'])LimelightEmbeddedPlayerFlash\1[^>]*>.*? - ]+ - name=(["\'])flashVars\2[^>]+ - value=(["\'])(?:(?!\3).)*mediaId=(?P[a-z0-9]{32}) - ''', webpage) - if mobj: - return self.url_result(smuggle_url( - 'limelight:media:%s' % mobj.group('id'), - {'source_url': url}), 'LimelightMedia', mobj.group('id')) - # Look for Anvato embeds anvato_urls = AnvatoIE._extract_urls(self, webpage, video_id) if anvato_urls: