From 61870915323abd126f5440282b1fd5734ee1ce6f Mon Sep 17 00:00:00 2001 From: remitamine Date: Fri, 18 Mar 2016 11:50:04 +0100 Subject: [PATCH] [once] check http formats availability --- youtube_dl/extractor/once.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/once.py b/youtube_dl/extractor/once.py index 403f8c0af..080045d4c 100644 --- a/youtube_dl/extractor/once.py +++ b/youtube_dl/extractor/once.py @@ -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 @@ def _extract_once_formats(self, url): '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