X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fworldstarhiphop.py;h=fc9237a3f2eb2b456302659b1954c2715e6feb35;hb=94d5e90b4f9d79970d88e263a5c962e63f9b13b5;hp=8a52c7a99147c4c871ac1cdf97272941effbc104;hpb=99c7bc94af6e845ffe38244608a6c4e10236e28d;p=youtube-dl

diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index 8a52c7a99..fc9237a3f 100644
--- a/youtube_dl/extractor/worldstarhiphop.py
+++ b/youtube_dl/extractor/worldstarhiphop.py
@@ -21,23 +21,16 @@ class WorldStarHipHopIE(InfoExtractor):
 
         webpage_src = self._download_webpage(url, video_id)
 
-        video_url = re.search(r'videoId=(.*?)&amp?',
-            webpage_src)
-        
-        if video_url:
+        m_vevo_id = re.search(r'videoId=(.*?)&amp?',
+                              webpage_src)
+
+        if m_vevo_id is not None:
             self.to_screen(u'Vevo video detected:')
-            return self.url_result('vevo:%s' % video_url.group(1), ie='Vevo')
+            return self.url_result('vevo:%s' % m_vevo_id.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')