Browse Source

[once] check http formats availability

remitamine 9 years ago
parent
commit
6187091532
1 changed files with 6 additions and 5 deletions
  1. 6 5
      youtube_dl/extractor/once.py

+ 6 - 5
youtube_dl/extractor/once.py

@@ -14,13 +14,12 @@ class OnceIE(InfoExtractor):
     def _extract_once_formats(self, url):
     def _extract_once_formats(self, url):
         domain_id, application_id, media_item_id = re.match(
         domain_id, application_id, media_item_id = re.match(
             OnceIE._VALID_URL, url).groups()
             OnceIE._VALID_URL, url).groups()
-        adaptive_formats = self._extract_m3u8_formats(
+        formats = self._extract_m3u8_formats(
             self.ADAPTIVE_URL_TEMPLATE % (
             self.ADAPTIVE_URL_TEMPLATE % (
                 domain_id, application_id, media_item_id),
                 domain_id, application_id, media_item_id),
             media_item_id, 'mp4', m3u8_id='hls', fatal=False)
             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(
             rendition_id = self._search_regex(
                 r'/now/media/playlist/[^/]+/[^/]+/([^/]+)',
                 r'/now/media/playlist/[^/]+/[^/]+/([^/]+)',
                 adaptive_format['url'], 'redition id', default=None)
                 adaptive_format['url'], 'redition id', default=None)
@@ -33,5 +32,7 @@ class OnceIE(InfoExtractor):
                         'hls', 'http'),
                         'hls', 'http'),
                     'protocol': '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
         return formats