diff options
| author | Marco Ferragina <marco.ferragina@gmail.com> | 2015-10-17 19:35:41 +0200 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2015-11-11 01:58:47 +0800 |
| commit | 42fc93c70928d34d46ceda644eb870e86daa8393 (patch) | |
| tree | 23c1fcb80a40ff837226c530465f1c44ed6e339f | |
| parent | a625e5654365a8a246fa5fc5f5d347adc67c5617 (diff) | |
| download | youtube-dl-42fc93c70928d34d46ceda644eb870e86daa8393.tar.gz youtube-dl-42fc93c70928d34d46ceda644eb870e86daa8393.tar.xz youtube-dl-42fc93c70928d34d46ceda644eb870e86daa8393.zip | |
vidto extractor: code cleanup
| -rw-r--r-- | docs/supportedsites.md | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/vidto.py | 32 |
2 files changed, 12 insertions, 21 deletions
diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 510d4d627..a9820c1f5 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -624,7 +624,6 @@ - **VideoTt**: video.tt - Your True Tube - **videoweed**: VideoWeed - **Vidme** - - **vidto**: VidTo.me - **Vidzi** - **vier** - **vier:videos** diff --git a/youtube_dl/extractor/vidto.py b/youtube_dl/extractor/vidto.py index 3cc585471..391f400fc 100644 --- a/youtube_dl/extractor/vidto.py +++ b/youtube_dl/extractor/vidto.py @@ -1,24 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import sys from .common import InfoExtractor +import re import time -from ..utils import ( - encode_dict, -) +from ..utils import encode_dict from ..compat import ( - compat_chr, - compat_parse_qs, - compat_urllib_parse, - compat_urllib_parse_unquote, - compat_urllib_parse_unquote_plus, - compat_urllib_parse_urlparse, compat_urllib_request, - compat_urlparse, - compat_str, + compat_urllib_parse ) @@ -37,8 +27,7 @@ class VidtoIE(InfoExtractor): } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') + video_id = self._match_id(url) page = self._download_webpage( 'http://%s/%s.html' % (self._HOST, video_id), video_id, 'Downloading video page') @@ -63,16 +52,19 @@ class VidtoIE(InfoExtractor): post_data = compat_urllib_parse.urlencode(encode_dict(form_str)).encode('ascii') req = compat_urllib_request.Request(url, post_data) req.add_header('Content-type', 'application/x-www-form-urlencoded') - for key, morsel in cookies.iteritems(): - req.add_header('Cookie', '%s=%s' % (morsel.key, morsel.value)) + cookie_string = "" + for key in cookies.keys(): + cookie_string += "%s=%s;" % (key, cookies[key].value) + + req.add_header('Cookie', '%s' % cookie_string) - print("Waiting for countdown...") + self.to_screen("Waiting for countdown...") time.sleep(7) post_result = self._download_webpage( - req, None, + req, video_id, note='Proceed to video...', errnote='unable to proceed', fatal=True) - file_link_regex = r'file_link ?= ?\'(https?:\/\/[0-9a-zA-z.\/\-_]+)' + file_link_regex = r'file_link\s*=\s*\'(https?:\/\/[0-9a-zA-z.\/\-_]+)' file_link = self._search_regex(file_link_regex, post_result, 'file_link', fatal=True) return { |