From 42a00816550217acde55b7ac30e6c577a0e400be Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 31 Mar 2020 18:34:20 +0000 Subject: [PATCH 1/2] srgssr: download two metafiles via HTTPS instead of HTTP --- youtube_dl/extractor/srgssr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dl/extractor/srgssr.py index 170dce87f..6ef5e843e 100644 --- a/youtube_dl/extractor/srgssr.py +++ b/youtube_dl/extractor/srgssr.py @@ -29,7 +29,7 @@ class SRGSSRIE(InfoExtractor): def _get_tokenized_src(self, url, video_id, format_id): sp = compat_urllib_parse_urlparse(url).path.split('/') token = self._download_json( - 'http://tp.srgssr.ch/akahd/token?acl=/%s/%s/*' % (sp[1], sp[2]), + 'https://tp.srgssr.ch/akahd/token?acl=/%s/%s/*' % (sp[1], sp[2]), video_id, 'Downloading %s token' % format_id, fatal=False) or {} auth_params = token.get('token', {}).get('authparams') if auth_params: @@ -38,7 +38,7 @@ class SRGSSRIE(InfoExtractor): def get_media_data(self, bu, media_type, media_id): media_data = self._download_json( - 'http://il.srgssr.ch/integrationlayer/1.0/ue/%s/%s/play/%s.json' % (bu, media_type, media_id), + 'https://il.srgssr.ch/integrationlayer/1.0/ue/%s/%s/play/%s.json' % (bu, media_type, media_id), media_id)[media_type.capitalize()] if media_data.get('block') and media_data['block'] in self._ERRORS: From 2757da855b2c4362a7292a486554a6d3f7255969 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 31 Mar 2020 18:49:37 +0000 Subject: [PATCH 2/2] select HTTPS stream sources instead of HTTP --- youtube_dl/extractor/srgssr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dl/extractor/srgssr.py index 6ef5e843e..1da6b5bfd 100644 --- a/youtube_dl/extractor/srgssr.py +++ b/youtube_dl/extractor/srgssr.py @@ -75,13 +75,13 @@ class SRGSSRIE(InfoExtractor): asset_url = asset['text'] quality = asset['@quality'] format_id = '%s-%s' % (protocol, quality) - if protocol.startswith('HTTP-HDS') or protocol.startswith('HTTP-HLS'): + if protocol.startswith('HTTPS-HDS') or protocol.startswith('HTTPS-HLS'): asset_url = self._get_tokenized_src(asset_url, media_id, format_id) - if protocol.startswith('HTTP-HDS'): + if protocol.startswith('HTTPS-HDS'): formats.extend(self._extract_f4m_formats( asset_url + ('?' if '?' not in asset_url else '&') + 'hdcore=3.4.0', media_id, f4m_id=format_id, fatal=False)) - elif protocol.startswith('HTTP-HLS'): + elif protocol.startswith('HTTPS-HLS'): formats.extend(self._extract_m3u8_formats( asset_url, media_id, 'mp4', 'm3u8_native', m3u8_id=format_id, fatal=False))