X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftelecinco.py;h=4b4b740b44d325ffb8a8a5c6cba848b0c99ced13;hb=d6712378e73951bede475569c887a1ac73f660a9;hp=b0bf9ab8d47fb1e9d5cbd7682f95f95c652fdb8e;hpb=d492dad8f440c8d0d006a896de0a56b01cd46496;p=youtube-dl diff --git a/youtube_dl/extractor/telecinco.py b/youtube_dl/extractor/telecinco.py index b0bf9ab8d..4b4b740b4 100644 --- a/youtube_dl/extractor/telecinco.py +++ b/youtube_dl/extractor/telecinco.py @@ -5,8 +5,8 @@ import json from .common import InfoExtractor from ..compat import ( - compat_urllib_parse, compat_urllib_parse_unquote, + compat_urllib_parse_urlencode, compat_urlparse, ) from ..utils import ( @@ -17,7 +17,7 @@ from ..utils import ( class TelecincoIE(InfoExtractor): - IE_DESC = 'telecinco.es, cuatro.es and mediaset.es' + IE_DESC = 'telecinco.es, cuatro.com and mediaset.es' _VALID_URL = r'https?://www\.(?:telecinco\.es|cuatro\.com|mediaset\.es)/(?:[^/]+/)+(?P.+?)\.html' _TESTS = [{ @@ -74,7 +74,7 @@ class TelecincoIE(InfoExtractor): info_el = self._download_xml(info_url, episode).find('./video/info') video_link = info_el.find('videoUrl/link').text - token_query = compat_urllib_parse.urlencode({'id': video_link}) + token_query = compat_urllib_parse_urlencode({'id': video_link}) token_info = self._download_json( embed_data['flashvars']['ov_tk'] + '?' + token_query, episode, @@ -82,6 +82,7 @@ class TelecincoIE(InfoExtractor): ) formats = self._extract_m3u8_formats( token_info['tokenizedUrl'], episode, ext='mp4', entry_protocol='m3u8_native') + self._sort_formats(formats) return { 'id': embed_data['videoId'],