aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-04-17 00:23:16 +0700
committerSergey M․ <dstftw@gmail.com>2017-04-17 00:23:16 +0700
commite5d39886ec8e4e40b2b7257d16cc5d8505cc1f69 (patch)
tree6263ed68d3b6c4b2146636e547abd7ba7c496062 /youtube_dl/extractor/generic.py
parent751c89a27d68c54375e96789cc90d4c8a3ce3dbc (diff)
downloadyoutube-dl-e5d39886ec8e4e40b2b7257d16cc5d8505cc1f69.zip
youtube-dl-e5d39886ec8e4e40b2b7257d16cc5d8505cc1f69.tar.gz
youtube-dl-e5d39886ec8e4e40b2b7257d16cc5d8505cc1f69.tar.bz2
[limelight] Improve embeds extraction (closes #12761)
* Move extraction code to extractor * Add extraction for LimelightEmbeddedPlayerFlash embeds * Extract multiple video
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 6a34c24..c523abb 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -85,6 +85,7 @@ from .ustream import UstreamIE
from .openload import OpenloadIE
from .videopress import VideoPressIE
from .rutube import RutubeIE
+from .limelight import LimelightBaseIE
class GenericIE(InfoExtractor):
@@ -2483,6 +2484,11 @@ class GenericIE(InfoExtractor):
return self.url_result(piksel_url, PikselIE.ie_key())
# Look for Limelight embeds
+ limelight_urls = LimelightBaseIE._extract_urls(webpage, url)
+ if limelight_urls:
+ return self.playlist_result(
+ limelight_urls, video_id, video_title, video_description)
+
mobj = re.search(r'LimelightPlayer\.doLoad(Media|Channel|ChannelList)\(["\'](?P<id>[a-z0-9]{32})', webpage)
if mobj:
lm = {