X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fminhateca.py;h=dccc542497692ac6aa14a6e36f6b96b0aad7741d;hb=54fc90aabfb71968f28af68dfe3f7a3544cc2f0b;hp=077c9b19dda06327544030b285dbcf05ae4fd023;hpb=7e26084d09be5a7c0d56bc1f6faa59d222d5eac2;p=youtube-dl diff --git a/youtube_dl/extractor/minhateca.py b/youtube_dl/extractor/minhateca.py index 077c9b19d..dccc54249 100644 --- a/youtube_dl/extractor/minhateca.py +++ b/youtube_dl/extractor/minhateca.py @@ -2,13 +2,12 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse, - compat_urllib_request, -) from ..utils import ( int_or_none, + parse_duration, parse_filesize, + sanitized_Request, + urlencode_postdata, ) @@ -20,7 +19,7 @@ class MinhatecaIE(InfoExtractor): 'id': '125848331', 'ext': 'mp4', 'title': 'youtube-dl test video', - 'thumbnail': 're:^https?://.*\.jpg$', + 'thumbnail': r're:^https?://.*\.jpg$', 'filesize_approx': 1530000, 'duration': 9, 'view_count': int, @@ -38,9 +37,9 @@ class MinhatecaIE(InfoExtractor): ('fileId', video_id), ('__RequestVerificationToken', token), ] - req = compat_urllib_request.Request( + req = sanitized_Request( 'http://minhateca.com.br/action/License/Download', - data=compat_urllib_parse.urlencode(token_data)) + data=urlencode_postdata(token_data)) req.add_header('Content-Type', 'application/x-www-form-urlencoded') data = self._download_json( req, video_id, note='Downloading metadata') @@ -52,8 +51,8 @@ class MinhatecaIE(InfoExtractor): filesize_approx = parse_filesize(self._html_search_regex( r'

(.*?)

', webpage, 'file size approximation', fatal=False)) - duration = int_or_none(self._html_search_regex( - r'(?s)

.*?([0-9]+)\s*s', + duration = parse_duration(self._html_search_regex( + r'(?s)

.*?class="bold">(.*?)<', webpage, 'duration', fatal=False)) view_count = int_or_none(self._html_search_regex( r'

([0-9]+)

',