From ac1ed971f63655e4bd9876d6979a016e6c05e949 Mon Sep 17 00:00:00 2001 From: kucksdorfs Date: Mon, 5 Mar 2018 19:59:09 -0600 Subject: [PATCH 1/2] Fixed issue #13490 #13490 - Removed OnceUrl to fix issue downloading certain CBS titles. --- youtube_dl/extractor/cbs.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index 1268e38ef..4479c83ce 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -70,15 +70,18 @@ class CBSIE(CBSBaseIE): 'mbr': 'true', 'assetTypes': asset_type, } - if asset_type.startswith('HLS') or asset_type in ('OnceURL', 'StreamPack'): + if asset_type.startswith('HLS') or asset_type in ('StreamPack'): query['formats'] = 'MPEG4,M3U' elif asset_type in ('RTMP', 'WIFI', '3G'): query['formats'] = 'MPEG4,FLV' + else: + continue tp_formats, tp_subtitles = self._extract_theplatform_smil( update_url_query(tp_release_url, query), content_id, 'Downloading %s SMIL data' % asset_type) formats.extend(tp_formats) subtitles = self._merge_subtitles(subtitles, tp_subtitles) + self._sort_formats(formats) info = self._extract_theplatform_metadata(tp_path, content_id) From ae059543bd08439f3958b982b74ff6939bb298da Mon Sep 17 00:00:00 2001 From: kucksdorfs Date: Tue, 6 Mar 2018 19:30:57 -0600 Subject: [PATCH 2/2] Made changes recommended by flake8 Ran flake8 on my machine and made recommended changes. --- youtube_dl/extractor/cbs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index 4479c83ce..9ccf36a23 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -81,7 +81,6 @@ class CBSIE(CBSBaseIE): 'Downloading %s SMIL data' % asset_type) formats.extend(tp_formats) subtitles = self._merge_subtitles(subtitles, tp_subtitles) - self._sort_formats(formats) info = self._extract_theplatform_metadata(tp_path, content_id)