X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvidzi.py;h=08a5a7b8ddbace34da0a4c6bb751562eb51a95ba;hb=bc694039e47cc871c98abacdf1c0a2e5a257a8a4;hp=82d2179e9a72d2527aacda2b781881b1e8fdcc1b;hpb=018e835594f961dfd625abc932451ef3c2c85038;p=youtube-dl diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dl/extractor/vidzi.py index 82d2179e9..08a5a7b8d 100644 --- a/youtube_dl/extractor/vidzi.py +++ b/youtube_dl/extractor/vidzi.py @@ -1,3 +1,4 @@ +# coding: utf-8 from __future__ import unicode_literals from .common import InfoExtractor @@ -6,28 +7,26 @@ from .common import InfoExtractor class VidziIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?vidzi\.tv/(?P\w+)' _TEST = { - 'url': 'http://vidzi.tv/m1chxrwq7bx9', - 'md5': '5c4c4a8ca2281a199c8eefe8f411d630', + 'url': 'http://vidzi.tv/cghql9yq6emu.html', + 'md5': '4f16c71ca0c8c8635ab6932b5f3f1660', 'info_dict': { - 'id': 'm1chxrwq7bx9', + 'id': 'cghql9yq6emu', 'ext': 'mp4', - 'title': 'Watch Cadbury Dream Factory S01E04 HDTV x264 FiHTV mp4', + 'title': 'youtube-dl test video 1\\\\2\'3/4<5\\\\6ä7↭', }, } def _real_extract(self, url): video_id = self._match_id(url) - + webpage = self._download_webpage(url, video_id) video_url = self._html_search_regex( r'{\s*file\s*:\s*"([^"]+)"\s*}', webpage, 'video url') title = self._html_search_regex( - r'([^<]+)<\/Title>', webpage, 'title') - + r'(?s)<h2 class="video-title">(.*?)</h2>', webpage, 'title') + return { 'id': video_id, 'title': title, 'url': video_url, - 'ext': 'mp4', } - \ No newline at end of file