mirror of
https://github.com/l1ving/youtube-dl
synced 2024-11-22 07:12:55 +08:00
Merge pull request #1148 from JohnyMoSwag/master
[worldstarhiphop] support vevo videos
This commit is contained in:
commit
99c7bc94af
@ -21,9 +21,23 @@ class WorldStarHipHopIE(InfoExtractor):
|
||||
|
||||
webpage_src = self._download_webpage(url, video_id)
|
||||
|
||||
video_url = re.search(r'videoId=(.*?)&?',
|
||||
webpage_src)
|
||||
|
||||
if video_url:
|
||||
self.to_screen(u'Vevo video detected:')
|
||||
return self.url_result('vevo:%s' % video_url.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')
|
||||
|
Loading…
Reference in New Issue
Block a user