diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-30 11:10:17 +0200 | 
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-30 11:10:17 +0200 | 
| commit | 2bc3de0f28757fbab65c862d8be763d643fe802a (patch) | |
| tree | 3e3e0b7b964f23eaee1ebf4f1ae0ce51120624de | |
| parent | 99c7bc94af6e845ffe38244608a6c4e10236e28d (diff) | |
[worldstarhiphop] Small cleanup
The second check for the Vevo id is not necessary.
| -rw-r--r-- | youtube_dl/extractor/worldstarhiphop.py | 13 | 
1 files changed, 3 insertions, 10 deletions
| 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=(.*?)&?', +        m_vevo_id = re.search(r'videoId=(.*?)&?',              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=(.*?)&?', -                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') | 
