aboutsummaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/extractor/srgssr.py
diff options
context:
space:
mode:
authorremitamine <[email protected]>2015-12-29 14:58:22 +0100
committerremitamine <[email protected]>2015-12-29 14:58:59 +0100
commitf2017cb020efe0956049bda11df4eec7c5985fda (patch)
tree1376b14cc066b4852ba808cdcbefb56efb0faf85 /youtube_dl/extractor/srgssr.py
parentf889ac45b83cd771919fba29c14cee9d24e637b7 (diff)
downloadyoutube-dl-f2017cb020efe0956049bda11df4eec7c5985fda.tar.gz
youtube-dl-f2017cb020efe0956049bda11df4eec7c5985fda.zip
[srgssr] split long lines and use m3u8_native
Diffstat (limited to 'youtube_dl/extractor/srgssr.py')
-rw-r--r--youtube_dl/extractor/srgssr.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dl/extractor/srgssr.py
index 2c8b4276b..d06d34316 100644
--- a/youtube_dl/extractor/srgssr.py
+++ b/youtube_dl/extractor/srgssr.py
@@ -29,7 +29,8 @@ class SRGSSRIE(InfoExtractor):
media_id)[media_type.capitalize()]
if media_data.get('block') and media_data['block'] in self._ERRORS:
- raise ExtractorError('%s said: %s' % (self.IE_NAME, self._ERRORS[media_data['block']]), expected=True)
+ raise ExtractorError('%s said: %s' % (
+ self.IE_NAME, self._ERRORS[media_data['block']]), expected=True)
return media_data
@@ -62,9 +63,13 @@ class SRGSSRIE(InfoExtractor):
assets[quality['@quality']] = quality['text']
asset_url = assets.get('HD') or assets.get('HQ') or assets.get('SD') or assets.get('MQ') or assets.get('LQ')
if '.f4m' in asset_url:
- formats.extend(self._extract_f4m_formats(asset_url + '?hdcore=3.4.0', media_id, f4m_id='hds', fatal=False))
+ formats.extend(self._extract_f4m_formats(
+ asset_url + '?hdcore=3.4.0', media_id,
+ f4m_id='hds', fatal=False))
elif '.m3u8' in asset_url:
- formats.extend(self._extract_m3u8_formats(asset_url, media_id, m3u8_id='hls', fatal=False))
+ formats.extend(self._extract_m3u8_formats(
+ asset_url, media_id, 'mp4', 'm3u8_native',
+ m3u8_id='hls', fatal=False))
else:
for asset in source['url']:
asset_url = asset['text']