Merge pull request #1148 from JohnyMoSwag/master

[worldstarhiphop] support vevo videos

diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index 5b9779c05853ab815aa56d710476356c56c8449b..8a52c7a99147c4c871ac1cdf97272941effbc104 100644 (file)
--- a/youtube_dl/extractor/worldstarhiphop.py
+++ b/youtube_dl/extractor/worldstarhiphop.py
@@ -21,9 +21,23 @@ class WorldStarHipHopIE(InfoExtractor):
 
         webpage_src = self._download_webpage(url, video_id)
 
+        video_url = re.search(r'videoId=(.*?)&amp?',
+            webpage_src)
+        
+        if video_url:
+            self.to_screen(u'Vevo video detected:')
+            return self.url_result('vevo:%s' % video_url.group(1), ie='Vevo')
+
         video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)',
             webpage_src, u'video URL')
 
+        if video_url is None:
+            video_url = self._search_regex(r'videoId=(.*?)&amp?',
+                webpage_src, u'video URL')
+            self.to_screen(u'Vevo video detected:')
+            vevo_id = 'vevo:%s' % video_url
+            return self.url_result(vevo_id, ie='Vevo')
+
         if 'youtube' in video_url:
             self.to_screen(u'Youtube video detected:')
             return self.url_result(video_url, ie='Youtube')