projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63f05de
)
detect vevo embed fix
author
Johny Mo Swag
<johnymo@me.com>
Mon, 29 Jul 2013 19:24:26 +0000
(12:24 -0700)
committer
Johny Mo Swag
<johnymo@me.com>
Mon, 29 Jul 2013 19:24:26 +0000
(12:24 -0700)
youtube_dl/extractor/worldstarhiphop.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/worldstarhiphop.py
b/youtube_dl/extractor/worldstarhiphop.py
index 8715848ee220391d6e7512f2230c5ada0258dcb9..a93928f3c4d653b217e90d24275e7a641cdb7760 100644
(file)
--- 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)
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)
webpage_src, u'video URL', fatal=False)
-
+
if video_url:
self.to_screen(u'Vevo video detected:')
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')
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')
if 'youtube' in video_url:
self.to_screen(u'Youtube video detected:')
return self.url_result(video_url, ie='Youtube')