X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fworldstarhiphop.py;h=3237596a3ace9796001f8ab78921ca9b6c84d2d1;hb=125cfd78e8579b1c6104d3ec2359417677863a8a;hp=a93928f3c4d653b217e90d24275e7a641cdb7760;hpb=579e2691feca6173c5a84c1fb4fe7a213386c223;p=youtube-dl

diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index a93928f3c..3237596a3 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 = self._search_regex(r'videoId=(.*?)&amp?',
-            webpage_src, u'video URL', fatal=False)
+        m_vevo_id = re.search(r'videoId=(.*?)&amp?',
+            webpage_src)
         
-        if video_url:
+        if m_vevo_id is not None:
             self.to_screen(u'Vevo video detected:')
-            return self.url_result('vevo:%s' % video_url, 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 == 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')