From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Tue, 30 Jul 2013 09:10:17 +0000 (+0200)
Subject: [worldstarhiphop] Small cleanup
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=2bc3de0f28757fbab65c862d8be763d643fe802a;p=youtube-dl

[worldstarhiphop] Small cleanup

The second check for the Vevo id is not necessary.
---

diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index 8a52c7a99..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 = re.search(r'videoId=(.*?)&amp?',
+        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.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')