diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py index 8a52c7a991..3237596a3a 100644 --- a/youtube_dl/extractor/worldstarhiphop.py +++ b/youtube_dl/extractor/worldstarhiphop.py @@ -21,23 +21,16 @@ def _real_extract(self, url): 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')