From: Jaime Marquínez Ferrándiz Date: Mon, 24 Jun 2013 10:31:41 +0000 (+0200) Subject: Add VevoIE X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=70d1924f8ba4d200ba43b0f1a1ea25d9e193c878;p=youtube-dl Add VevoIE --- diff --git a/test/tests.json b/test/tests.json index 01367b0fb..fd037d818 100644 --- a/test/tests.json +++ b/test/tests.json @@ -649,5 +649,16 @@ "info_dict": { "title": "When Girls Act Like D-Bags" } + }, + { + "name": "Vevo", + "url": "http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280", + "file": "GB1101300280.mp4", + "md5": "06bea460acb744eab74a9d7dcb4bfd61", + "info_dict": { + "title": "Somebody To Die For", + "upload_date": "20130624", + "uploader": "Hurts" + } } ] diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b208f9002..9878ad942 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -44,6 +44,7 @@ from .ted import TEDIE from .tumblr import TumblrIE from .ustream import UstreamIE from .vbox7 import Vbox7IE +from .vevo import VevoIE from .vimeo import VimeoIE from .vine import VineIE from .worldstarhiphop import WorldStarHipHopIE @@ -125,6 +126,7 @@ def gen_extractors(): GametrailersIE(), StatigramIE(), BreakIE(), + VevoIE(), GenericIE() ] diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py new file mode 100644 index 000000000..7aa04ef68 --- /dev/null +++ b/youtube_dl/extractor/vevo.py @@ -0,0 +1,40 @@ +import re +import json + +from .common import InfoExtractor +from ..utils import ( + unified_strdate, + ExtractorError, +) + +class VevoIE(InfoExtractor): + _VALID_URL = r'http://www.vevo.com/watch/.*?/.*?/(?P.*)$' + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + video_id = mobj.group('id') + + json_url = 'http://www.vevo.com/data/video/%s' % video_id + base_url = 'http://smil.lvl3.vevo.com' + videos_url = '%s/Video/V2/VFILE/%s/%sr.smil' % (base_url, video_id, video_id.lower()) + info_json = self._download_webpage(json_url, video_id, u'Downloading json info') + links_webpage = self._download_webpage(videos_url, video_id, u'Downloading videos urls') + + self.report_extraction(video_id) + video_info = json.loads(info_json) + m_urls = list(re.finditer(r'