aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/worldstarhiphop.py
diff options
context:
space:
mode:
authorJohny Mo Swag <johnymo@me.com>2013-07-29 12:24:26 -0700
committerJohny Mo Swag <johnymo@me.com>2013-07-29 12:24:26 -0700
commit579e2691feca6173c5a84c1fb4fe7a213386c223 (patch)
tree6c9414f35ef5cee96a1e55bcd8d98719feae4919 /youtube_dl/extractor/worldstarhiphop.py
parent63f05de10bac9250f58b2f15539f109ec75b3af7 (diff)
downloadyoutube-dl-579e2691feca6173c5a84c1fb4fe7a213386c223.zip
youtube-dl-579e2691feca6173c5a84c1fb4fe7a213386c223.tar.gz
youtube-dl-579e2691feca6173c5a84c1fb4fe7a213386c223.tar.bz2
detect vevo embed fix
Diffstat (limited to 'youtube_dl/extractor/worldstarhiphop.py')
-rw-r--r--youtube_dl/extractor/worldstarhiphop.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index 8715848..a93928f 100644
--- a/youtube_dl/extractor/worldstarhiphop.py
+++ b/youtube_dl/extractor/worldstarhiphop.py
@@ -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')