Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[worldstarhiphop] Small cleanup

Browse Source 
The second check for the Vevo id is not necessary.
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-07-30 11:10:17 +02:00
parent 99c7bc94af
commit 2bc3de0f28
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/worldstarhiphop.py
View File

@ -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=(.*?)&amp?', m_vevo_id = re.search(r'videoId=(.*?)&amp?',
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=(.*?)&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')