]> git.bitcoin.ninja Git - youtube-dl/blobdiff - youtube_dl/extractor/generic.py
[generic] Do not use compatibility result fallback
[youtube-dl] / youtube_dl / extractor / generic.py
index a7ea9f733ce8c57076f8acaf496ad0109470ad2d..da933067a33949c4a345820fc00ab8ab260f5d11 100644 (file)
@@ -148,7 +148,7 @@ class GenericIE(InfoExtractor):
         try:
             new_url = self._test_redirect(url)
             if new_url:
-                return [self.url_result(new_url)]
+                return self.url_result(new_url)
         except compat_urllib_error.HTTPError:
             # This may be a stupid server that doesn't like HEAD, our UA, or so
             pass
@@ -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: