Prepare to release.

[youtubedl] / youtube_dl / extractor / matchtv.py

diff --git a/youtube_dl/extractor/matchtv.py b/youtube_dl/extractor/matchtv.py
index 28e0dfe63348082f65df20463ab8a2001d8592fa..bc9933a8134eea759918aad3475dd42c7f6b406e 100644 (file)
--- a/youtube_dl/extractor/matchtv.py
+++ b/youtube_dl/extractor/matchtv.py
@@ -4,32 +4,32 @@ from __future__ import unicode_literals
 import random
 
 from .common import InfoExtractor
 import random
 
 from .common import InfoExtractor

-from ..compat import compat_urllib_parse
-from ..utils import (
-    sanitized_Request,
-    xpath_text,
-)
+from ..utils import xpath_text

 
 
 class MatchTVIE(InfoExtractor):
 
 
 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',
             'ext': 'flv',
         'url': 'http://matchtv.ru/#live-player',
         'info_dict': {
             'id': 'matchtv-live',
             'ext': 'flv',

-            'title': 're:^Матч ТВ - Прямой эфир \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+            'title': r're:^Матч ТВ - Прямой эфир \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',

             'is_live': True,
         },
         'params': {
             'skip_download': True,
         },
             'is_live': True,
         },
         'params': {
             'skip_download': True,
         },

-    }
+    }, {
+        'url': 'http://matchtv.ru/on-air/',
+        'only_matching': True,
+    }]

 
     def _real_extract(self, url):
         video_id = 'matchtv-live'
 
     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',
                 'ts': '',
                 'quality': 'SD',
                 'contentId': '561d2c0df7159b37178b4567',


@@ -40,13 +40,13 @@ class MatchTVIE(InfoExtractor):
                 'contentType': 'channel',
                 'timeShift': '0',
                 'platform': 'portal',
                 'contentType': 'channel',
                 'timeShift': '0',
                 'platform': 'portal',

-            }),
+            },

             headers={
                 'Referer': 'http://player.matchtv.ntvplus.tv/embed-player/NTVEmbedPlayer.swf',
             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)
         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)

         return {
             'id': video_id,
             'title': self._live_title('Матч ТВ - Прямой эфир'),
         return {
             'id': video_id,
             'title': self._live_title('Матч ТВ - Прямой эфир'),