X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvevo.py;h=14abd58e8384ea4c99c75e571279d790cdf36707;hb=b7a68384078ec0d97fb3c8e4a3100e9c60f340d0;hp=aa88e1a92e587a9d68075ac6a5196e35ce7857af;hpb=515d7a5e73082c0f2e35bf7e778573bb2bbd576e;p=youtube-dl diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index aa88e1a92..14abd58e8 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -3,16 +3,25 @@ import json from .common import InfoExtractor from ..utils import ( - unified_strdate, ExtractorError, ) class VevoIE(InfoExtractor): """ - Accecps urls from vevo.com or in the format 'vevo:{id}' + Accepts urls from vevo.com or in the format 'vevo:{id}' (currently used by MTVIE) """ _VALID_URL = r'((http://www.vevo.com/watch/.*?/.*?/)|(vevo:))(?P.*)$' + _TEST = { + u'url': u'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280', + u'file': u'GB1101300280.mp4', + u'md5': u'06bea460acb744eab74a9d7dcb4bfd61', + u'info_dict': { + u"upload_date": u"20130624", + u"uploader": u"Hurts", + u"title": u"Somebody to Die For" + } + } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) @@ -26,12 +35,12 @@ class VevoIE(InfoExtractor): self.report_extraction(video_id) video_info = json.loads(info_json) - m_urls = list(re.finditer(r'