Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-10 13:42:56 +08:00
Code Issues Releases Wiki Activity

[srgssr] Rebase master

Browse Source
This commit is contained in:
Alex Seiler 2017-02-06 21:27:18 +01:00
parent a8f2dc15cd
commit 4d6f255eb3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/srgssr.py
View File

@ -44,15 +44,14 @@ class SRGSSRIE(InfoExtractor):
self.IE_NAME, self._ERRORS[media_data['block']]), expected=True) self.IE_NAME, self._ERRORS[media_data['block']]), expected=True)
return media_data return media_data
def _get_subtitles(self, bu, media_data): def _extract_subtitles(self, bu, media_data):
subtitles = {} subtitles = {}
langs = { langs = {
'srf': 'deu', 'srf': 'deu',
# RTS has its own InfoExtractor in rts.py 'rts': 'fra',
# 'rts': 'fra',
'rsi': 'ita', 'rsi': 'ita',
'rtr': 'roh', 'rtr': 'roh',
'swissinfo': 'eng' # assume english for swissinfo 'swi': 'eng',
} }
subtitle_data = media_data.get('Subtitles') subtitle_data = media_data.get('Subtitles')
formats = [{'ext': 'ttml', 'urltag': 'TTMLUrl'}, formats = [{'ext': 'ttml', 'urltag': 'TTMLUrl'},
@ -79,7 +78,7 @@ class SRGSSRIE(InfoExtractor):
'url': image['url'], 'url': image['url'],
} for image in media_data.get('Image', {}).get('ImageRepresentations', {}).get('ImageRepresentation', [])] } for image in media_data.get('Image', {}).get('ImageRepresentations', {}).get('ImageRepresentation', [])]
subtitles = self._get_subtitles(bu, media_data) subtitles = self._extract_subtitles(bu, media_data)
preference = qualities(['LQ', 'MQ', 'SD', 'HQ', 'HD']) preference = qualities(['LQ', 'MQ', 'SD', 'HQ', 'HD'])
formats = [] formats = []
@ -137,7 +136,7 @@ class SRGSSRPlayIE(InfoExtractor):
}, { }, {
# No Speichern (Save) button # No Speichern (Save) button
'url': 'http://www.srf.ch/play/tv/wort-zum-sonntag/video/vorsaetzlich-gross-denken?id=a2d82e8a-1916-4c29-aade-eec0930ceeeb', 'url': 'http://www.srf.ch/play/tv/wort-zum-sonntag/video/vorsaetzlich-gross-denken?id=a2d82e8a-1916-4c29-aade-eec0930ceeeb',
'md5': '592bef4eb1e7db6418720c8275231ce0', 'md5': '4fd7f008e7cb03f876f50db2fcd7ffcc',
'info_dict': { 'info_dict': {
'id': 'a2d82e8a-1916-4c29-aade-eec0930ceeeb', 'id': 'a2d82e8a-1916-4c29-aade-eec0930ceeeb',
'ext': 'mp4', 'ext': 'mp4',