diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-06-12 01:57:23 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-06-12 01:57:23 +0700 |
| commit | 80ae228b344ce36a07fb91c7e968fc5249c03161 (patch) | |
| tree | c5553067e3dccc5da65ff1246f5ad881a4591493 | |
| parent | 6d28c408cfb0ce42f591cc6e2bb67522c0812c72 (diff) | |
| download | youtube-dl-80ae228b344ce36a07fb91c7e968fc5249c03161.tar.gz youtube-dl-80ae228b344ce36a07fb91c7e968fc5249c03161.tar.xz youtube-dl-80ae228b344ce36a07fb91c7e968fc5249c03161.zip | |
[matchtv] Modernize
| -rw-r--r-- | youtube_dl/extractor/matchtv.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/youtube_dl/extractor/matchtv.py b/youtube_dl/extractor/matchtv.py index 80a0d7013..33b0b539f 100644 --- a/youtube_dl/extractor/matchtv.py +++ b/youtube_dl/extractor/matchtv.py @@ -4,16 +4,12 @@ from __future__ import unicode_literals import random from .common import InfoExtractor -from ..compat import compat_urllib_parse_urlencode -from ..utils import ( - sanitized_Request, - xpath_text, -) +from ..utils import xpath_text class MatchTVIE(InfoExtractor): - _VALID_URL = r'https?://matchtv\.ru/?#live-player' - _TEST = { + _VALID_URL = r'https?://matchtv\.ru(?:/on-air|/?#live-player)' + _TESTS = [{ 'url': 'http://matchtv.ru/#live-player', 'info_dict': { 'id': 'matchtv-live', @@ -24,12 +20,16 @@ class MatchTVIE(InfoExtractor): 'params': { 'skip_download': True, }, - } + }, { + 'url': 'http://matchtv.ru/on-air/', + 'only_matching': True, + }] def _real_extract(self, url): video_id = 'matchtv-live' - request = sanitized_Request( - 'http://player.matchtv.ntvplus.tv/player/smil?%s' % compat_urllib_parse_urlencode({ + video_url = self._download_json( + 'http://player.matchtv.ntvplus.tv/player/smil', video_id, + query={ 'ts': '', 'quality': 'SD', 'contentId': '561d2c0df7159b37178b4567', @@ -40,11 +40,10 @@ class MatchTVIE(InfoExtractor): 'contentType': 'channel', 'timeShift': '0', 'platform': 'portal', - }), + }, headers={ 'Referer': 'http://player.matchtv.ntvplus.tv/embed-player/NTVEmbedPlayer.swf', - }) - video_url = self._download_json(request, video_id)['data']['videoUrl'] + })['data']['videoUrl'] f4m_url = xpath_text(self._download_xml(video_url, video_id), './to') formats = self._extract_f4m_formats(f4m_url, video_id) self._sort_formats(formats) |