From a5203935d6cb753bafaf67164553027b62c01781 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Sat, 11 Nov 2017 12:41:15 +0100 Subject: [PATCH] [gamespot] skip Brightcove Once http formats(#14652) --- youtube_dl/extractor/gamespot.py | 3 ++- youtube_dl/extractor/once.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/gamespot.py b/youtube_dl/extractor/gamespot.py index 6d177cbaf3..be1ed8b4a3 100644 --- a/youtube_dl/extractor/gamespot.py +++ b/youtube_dl/extractor/gamespot.py @@ -108,7 +108,8 @@ def _real_extract(self, url): onceux_url = self._parse_json(unescapeHTML(onceux_json), page_id).get('metadataUri') if onceux_url: formats.extend(self._extract_once_formats(re.sub( - r'https?://[^/]+', 'http://once.unicornmedia.com', onceux_url))) + r'https?://[^/]+', 'http://once.unicornmedia.com', onceux_url), + skip_http_formats=True)) if not formats: for quality in ['sd', 'hd']: diff --git a/youtube_dl/extractor/once.py b/youtube_dl/extractor/once.py index a637c8ecfb..6ba6fe5d3a 100644 --- a/youtube_dl/extractor/once.py +++ b/youtube_dl/extractor/once.py @@ -11,7 +11,7 @@ class OnceIE(InfoExtractor): ADAPTIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/master/playlist/%s/%s/%s/content.m3u8' PROGRESSIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/media/progressive/%s/%s/%s/%s/content.mp4' - def _extract_once_formats(self, url): + def _extract_once_formats(self, url, skip_http_formats=False): domain_id, application_id, media_item_id = re.match( OnceIE._VALID_URL, url).groups() formats = self._extract_m3u8_formats( @@ -27,7 +27,7 @@ def _extract_once_formats(self, url): rendition_id = self._search_regex( r'/now/media/playlist/[^/]+/[^/]+/([^/]+)', adaptive_format['url'], 'redition id', default=None) - if rendition_id: + if rendition_id and not skip_http_formats: progressive_format = adaptive_format.copy() progressive_format.update({ 'url': self.PROGRESSIVE_URL_TEMPLATE % (