Madeorsk
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge bc478ec1e3 into d65d89183f

This commit is contained in:
Emanuele Panzeri 2020-09-26 01:12:22 +00:00 committed by GitHub
parent d65d89183f bc478ec1e3
commit 3d12a8c352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
youtube_dl/extractor/rai.py
View File

@ -15,12 +15,14 @@ from ..utils import (
GeoRestrictedError,
int_or_none,
parse_duration,
str_or_none,
strip_or_none,
try_get,
unescapeHTML,
unified_strdate,
unified_timestamp,
update_url_query,
url_or_none,
urljoin,
xpath_text,
)
@ -102,8 +104,7 @@ class RaiBaseIE(InfoExtractor):
}.items() if v is not None)
@staticmethod
def _extract_subtitles(url, subtitle_url):
subtitles = {}
def _extract_subtitles(url, subtitle_url, subtitles):
if subtitle_url and isinstance(subtitle_url, compat_str):
subtitle_url = urljoin(url, subtitle_url)
STL_EXT = '.stl'
@ -120,6 +121,23 @@ class RaiBaseIE(InfoExtractor):
})
return subtitles
@staticmethod
def _extract_subtitles_from_list(subtitle_array, subtitles):
if isinstance(subtitle_array, list):
for item in subtitle_array:
subtitle_lang = item.get('language')
subtitle_url = item.get('url')
# Handle relative subtitles URL
if None == url_or_none(subtitle_url):
subtitle_url = 'https://www.raiplay.it'+subtitle_url
if url_or_none(subtitle_url) and str_or_none(subtitle_lang):
subtitles[subtitle_lang.lower()] = [{
'ext': subtitle_url[-3:],
'url': subtitle_url,
}]
return subtitles
class RaiPlayIE(RaiBaseIE):
_VALID_URL = r'(?P<url>https?://(?:www\.)?raiplay\.it/.+?-(?P<id>%s)\.html)' % RaiBaseIE._UUID_RE
@ -142,21 +160,20 @@ class RaiPlayIE(RaiBaseIE):
'season': '2016',
},
}, {
'url': 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html',
'url': 'https://www.raiplay.it/video/2019/10/Report-del-21102019-La-fabbrica-della-paura-825ce3a7-8573-46c8-80d2-cde1b519fd01.html',
'md5': '8970abf8caf8aef4696e7b1f2adfc696',
'info_dict': {
'id': 'cb27157f-9dd0-4aee-b788-b1f67643a391',
'ext': 'mp4',
'title': 'Report del 07/04/2014',
'alt_title': 'S2013/14 - Puntata del 07/04/2014',
'id': '825ce3a7-8573-46c8-80d2-cde1b519fd01',
'title': 'Report - La fabbrica della paura',
'alt_title': 'St 2019/20 - La fabbrica della paura - 21/10/2019 ',
'description': 'md5:f27c544694cacb46a078db84ec35d2d9',
'thumbnail': r're:^https?://.*\.jpg$',
'uploader': 'Rai 5',
'creator': 'Rai 5',
'duration': 6160,
'ext': 'mp4',
'series': 'Report',
'season_number': 5,
'season': '2013/14',
'season_number': 7,
'season': '2019/20',
'subtitles': {
'it': [{'ext': 'srt'}]
},
},
'params': {
'skip_download': True,
@ -170,14 +187,12 @@ class RaiPlayIE(RaiBaseIE):
mobj = re.match(self._VALID_URL, url)
url, video_id = mobj.group('url', 'id')
media = self._download_json(
'%s?json' % url, video_id, 'Downloading video JSON')
media = self._download_json(url.replace('.html', '.json'), video_id, 'Downloading video JSON')
title = media['name']
video = media['video']
relinker_info = self._extract_relinker_info(video['contentUrl'], video_id)
relinker_info = self._extract_relinker_info(video['content_url'], video_id)
self._sort_formats(relinker_info['formats'])
thumbnails = []
@ -191,8 +206,11 @@ class RaiPlayIE(RaiBaseIE):
timestamp = unified_timestamp(try_get(
media, lambda x: x['availabilities'][0]['start'], compat_str))
subtitles = self._extract_subtitles(url, video.get('subtitles'))
subtitles = {}
if '' != video.get('subtitles'):
subtitles = self._extract_subtitles(url, video.get('subtitles'), subtitles)
if video.get('subtitlesArray'):
subtitles = self._extract_subtitles_from_list(video.get('subtitlesArray'), subtitles)
info = {
'id': video_id,
'title': self._live_title(title) if relinker_info.get(