diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-30 11:05:40 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-30 11:05:40 +0200 |
| commit | 99c7bc94af6e845ffe38244608a6c4e10236e28d (patch) | |
| tree | 99b98b45d322fd20785f1f47bbfc470c3fb6bf7a | |
| parent | 152c8f349d9029dc8465bef9474143567f687562 (diff) | |
| parent | d75654c15ea67424abf0fe69fdfb50e2a2d50101 (diff) | |
| download | youtube-dl-99c7bc94af6e845ffe38244608a6c4e10236e28d.tar.gz youtube-dl-99c7bc94af6e845ffe38244608a6c4e10236e28d.tar.xz youtube-dl-99c7bc94af6e845ffe38244608a6c4e10236e28d.zip | |
Merge pull request #1148 from JohnyMoSwag/master
[worldstarhiphop] support vevo videos
| -rw-r--r-- | youtube_dl/extractor/worldstarhiphop.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py index 5b9779c05..8a52c7a99 100644 --- a/youtube_dl/extractor/worldstarhiphop.py +++ b/youtube_dl/extractor/worldstarhiphop.py @@ -21,9 +21,23 @@ class WorldStarHipHopIE(InfoExtractor): webpage_src = self._download_webpage(url, video_id) + video_url = re.search(r'videoId=(.*?)&?', + webpage_src) + + if video_url: + self.to_screen(u'Vevo video detected:') + return self.url_result('vevo:%s' % video_url.group(1), ie='Vevo') + video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)', webpage_src, u'video URL') + if video_url is 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') |