mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-25 17:27:36 +00:00
[worldstarhiphop] Small cleanup
The second check for the Vevo id is not necessary.
This commit is contained in:
parent
99c7bc94af
commit
2bc3de0f28
1 changed files with 3 additions and 10 deletions
|
@ -21,23 +21,16 @@ class WorldStarHipHopIE(InfoExtractor):
|
||||||
|
|
||||||
webpage_src = self._download_webpage(url, video_id)
|
webpage_src = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
video_url = re.search(r'videoId=(.*?)&?',
|
m_vevo_id = re.search(r'videoId=(.*?)&?',
|
||||||
webpage_src)
|
webpage_src)
|
||||||
|
|
||||||
if video_url:
|
if m_vevo_id is not None:
|
||||||
self.to_screen(u'Vevo video detected:')
|
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","(.*?)"\)',
|
video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)',
|
||||||
webpage_src, u'video URL')
|
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:
|
if 'youtube' in video_url:
|
||||||
self.to_screen(u'Youtube video detected:')
|
self.to_screen(u'Youtube video detected:')
|
||||||
return self.url_result(video_url, ie='Youtube')
|
return self.url_result(video_url, ie='Youtube')
|
||||||
|
|
Loading…
Reference in a new issue