From 579e2691feca6173c5a84c1fb4fe7a213386c223 Mon Sep 17 00:00:00 2001
From: Johny Mo Swag <johnymo@me.com>
Date: Mon, 29 Jul 2013 12:24:26 -0700
Subject: [PATCH] detect vevo embed fix
---
youtube_dl/extractor/worldstarhiphop.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index 8715848ee..a93928f3c 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=(.*?)&?',
+ video_url = self._search_regex(r'videoId=(.*?)&?',
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=(.*?)&?',
+ 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')