Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

detect vevo embed fix

pull/1148/head
Johny Mo Swag 2013-07-29 12:24:26 -07:00
parent 63f05de10b
commit 579e2691fe
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/worldstarhiphop.py
View File

@ -21,17 +21,23 @@ class WorldStarHipHopIE(InfoExtractor):
webpage_src = self._download_webpage(url, video_id)
video_url = self._search_regex('videoId=(.*?)&amp?',
video_url = self._search_regex(r'videoId=(.*?)&amp?',
webpage_src, u'video URL', fatal=False)
if video_url:
self.to_screen(u'Vevo video detected:')
vevo_id = 'vevo:%s' video_url
self.url_result(vevo_id)
return self.url_result('vevo:%s' % video_url, ie='Vevo')
video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)',
webpage_src, u'video URL')
if video_url == 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:
self.to_screen(u'Youtube video detected:')
return self.url_result(video_url, ie='Youtube')