X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvidzi.py;h=7c6e98026823e0df415664ad0b4d6995c9e2f673;hb=fae45ede082e50a4935e014b47cbfde925c0f8ed;hp=669979e13660b55d8c6f426aaab2b888007b8c5b;hpb=2c26df763c42433fea30ef46736156c689a74fd9;p=youtube-dl diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dl/extractor/vidzi.py index 669979e13..7c6e98026 100644 --- a/youtube_dl/extractor/vidzi.py +++ b/youtube_dl/extractor/vidzi.py @@ -1,7 +1,8 @@ -#coding: utf-8 +# coding: utf-8 from __future__ import unicode_literals from .common import InfoExtractor +from ..utils import smuggle_url class VidziIE(InfoExtractor): @@ -13,21 +14,26 @@ class VidziIE(InfoExtractor): 'id': 'cghql9yq6emu', 'ext': 'mp4', 'title': 'youtube-dl test video 1\\\\2\'3/4<5\\\\6ä7↭', + 'uploader': 'vidzi.tv', + }, + 'params': { + # m3u8 download + 'skip_download': True, }, } 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'(?s)

(.*?)

', webpage, 'title') - + + # Vidzi now uses jwplayer, which can be handled by GenericIE return { + '_type': 'url_transparent', 'id': video_id, 'title': title, - 'url': video_url, + 'url': smuggle_url(url, {'to_generic': True}), + 'ie_key': 'Generic', } - \ No newline at end of file