From: Sergey M․ Date: Wed, 11 Nov 2015 16:43:17 +0000 (+0600) Subject: [vidto] Remove extractor X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=435911029f1dfbe0caaf460a09742e864e656478;p=youtube-dl [vidto] Remove extractor --- diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index ef6c7f0de..0a90da73c 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -730,7 +730,6 @@ from .videopremium import VideoPremiumIE from .videott import VideoTtIE from .videoweed import VideoWeedIE from .vidme import VidmeIE -from .vidto import VidtoIE from .vidzi import VidziIE from .vier import VierIE, VierVideosIE from .viewster import ViewsterIE diff --git a/youtube_dl/extractor/vidto.py b/youtube_dl/extractor/vidto.py deleted file mode 100644 index 5ebf0f3d3..000000000 --- a/youtube_dl/extractor/vidto.py +++ /dev/null @@ -1,57 +0,0 @@ -# coding: utf-8 -from __future__ import unicode_literals - -import time - -from .common import InfoExtractor -from ..utils import ( - encode_dict, - remove_end, - urlencode_postdata, -) -from ..compat import compat_urllib_request - - -class VidtoIE(InfoExtractor): - IE_NAME = 'vidto' - IE_DESC = 'VidTo.me' - _VALID_URL = r'https?://(?:www\.)?vidto\.me/(?P[0-9a-zA-Z]+)\.html' - _TEST = { - 'url': 'http://vidto.me/ku5glz52nqe1.html', - 'info_dict': { - 'id': 'ku5glz52nqe1', - 'ext': 'mp4', - 'title': 'test' - } - } - - def _real_extract(self, url): - video_id = self._match_id(url) - - page = self._download_webpage( - 'http://vidto.me/%s.html' % video_id, video_id, 'Downloading video page') - - title = remove_end(self._html_search_regex( - r'\s*([^<]+)\s*', page, 'title'), ' - Vidto') - - hidden_fields = self._hidden_inputs(page) - - self.to_screen('Waiting for countdown...') - time.sleep(7) - - req = compat_urllib_request.Request( - url, urlencode_postdata(encode_dict(hidden_fields))) - req.add_header('Content-type', 'application/x-www-form-urlencoded') - - post_result = self._download_webpage( - req, video_id, - note='Proceed to video...', errnote='unable to proceed') - - file_link = self._search_regex( - r'file_link\s*=\s*\'(https?:\/\/[0-9a-zA-z.\/\-_]+)', post_result, 'file_link') - - return { - 'id': video_id, - 'url': file_link, - 'title': title, - }