]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[once] check http formats availability
authorremitamine <remitamine@gmail.com>
Fri, 18 Mar 2016 10:50:04 +0000 (11:50 +0100)
committerremitamine <remitamine@gmail.com>
Fri, 18 Mar 2016 10:51:34 +0000 (11:51 +0100)
youtube_dl/extractor/once.py

index 403f8c0afcff6e3c0532508dbd060788f400d795..080045d4c1446875cb40fdf85c516e1e4cc419a3 100644 (file)
@@ -14,13 +14,12 @@ class OnceIE(InfoExtractor):
     def _extract_once_formats(self, url):
         domain_id, application_id, media_item_id = re.match(
             OnceIE._VALID_URL, url).groups()
-        adaptive_formats = self._extract_m3u8_formats(
+        formats = self._extract_m3u8_formats(
             self.ADAPTIVE_URL_TEMPLATE % (
                 domain_id, application_id, media_item_id),
             media_item_id, 'mp4', m3u8_id='hls', fatal=False)
-        formats = []
-        formats.extend(adaptive_formats)
-        for adaptive_format in adaptive_formats:
+        progressive_formats = []
+        for adaptive_format in formats:
             rendition_id = self._search_regex(
                 r'/now/media/playlist/[^/]+/[^/]+/([^/]+)',
                 adaptive_format['url'], 'redition id', default=None)
@@ -33,5 +32,7 @@ class OnceIE(InfoExtractor):
                         'hls', 'http'),
                     'protocol': 'http',
                 })
-                formats.append(progressive_format)
+                progressive_formats.append(progressive_format)
+        self._check_formats(progressive_formats, media_item_id)
+        formats.extend(progressive_formats)
         return formats