diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-12-16 21:45:21 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-12-16 21:45:21 +0100 |
| commit | f25571ffbf67c14bb91798e445a2690e03481937 (patch) | |
| tree | 90d9941b289a720adaa1a4d6c2e633e2fefd3658 | |
| parent | 8fe56478f879a21e24695a4e27ba8546d0822f7b (diff) | |
| download | youtube-dl-f25571ffbf67c14bb91798e445a2690e03481937.tar.gz youtube-dl-f25571ffbf67c14bb91798e445a2690e03481937.tar.xz youtube-dl-f25571ffbf67c14bb91798e445a2690e03481937.zip | |
Add support for embedded vevo player (Fixes #1957)
| -rw-r--r-- | youtube_dl/extractor/generic.py | 6 | ||||
| -rw-r--r-- | youtube_dl/extractor/vevo.py | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index a7ea9f733..fca23b6c4 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -241,6 +241,12 @@ class GenericIE(InfoExtractor): # Don't set the extractor because it can be a track url or an album return self.url_result(burl) + # Look for embedded Vevo player + mobj = re.search( + r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:cache\.)?vevo\.com/.+?)\1', webpage) + if mobj is not None: + return self.url_result(mobj.group('url')) + # Start with something easy: JW Player in SWFObject mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage) if mobj is None: diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index 4823992ef..7eda9469b 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -15,7 +15,11 @@ class VevoIE(InfoExtractor): Accepts urls from vevo.com or in the format 'vevo:{id}' (currently used by MTVIE) """ - _VALID_URL = r'((http://www\.vevo\.com/watch/(?:[^/]+/[^/]+/)?)|(vevo:))(?P<id>.*?)(\?|$)' + _VALID_URL = r'''(?x) + (?:https?://www\.vevo\.com/watch/(?:[^/]+/[^/]+/)?| + https?://cache\.vevo\.com/m/html/embed\.html\?video=| + vevo:) + (?P<id>[^&?#]+)''' _TESTS = [{ u'url': u'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280', u'file': u'GB1101300280.mp4', |