fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1148 from JohnyMoSwag/master 

[worldstarhiphop] support vevo videos
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-07-30 11:05:40 +02:00
parent 152c8f349d d75654c15e
commit 99c7bc94af
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/worldstarhiphop.py
View File

@ -21,9 +21,23 @@ 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=(.*?)&amp?',
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","(.*?)"\)', 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=(.*?)&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: 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')