From 0a3a0abb4b143f025634b4f41566b9008fbea910 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 20 Jun 2017 17:40:12 +0200 Subject: [PATCH] Delegate to RaiPlayIE --- youtube_dl/extractor/rai.py | 40 ++++--------------------------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/youtube_dl/extractor/rai.py b/youtube_dl/extractor/rai.py index 3bc61a814..7a8c16ef9 100644 --- a/youtube_dl/extractor/rai.py +++ b/youtube_dl/extractor/rai.py @@ -225,45 +225,13 @@ class RaiPlayLiveIE(RaiBaseIE): webpage = self._download_webpage(url, channel) re_id = r']*)data-uniquename=(["\'])[\w-]*(?P%s)(\2)([^>]*?)>' % RaiBaseIE._UUID_RE video_id = self._html_search_regex(re_id, webpage, 'livestream-id', group='id') - url = 'http://www.raiplay.it/dirette/ContentItem-%s.html' % video_id - media = self._download_json( - '%s?json' % url, video_id, 'Downloading video JSON') - - title = media['name'] - video = media['video'] - - relinker_info = self._extract_relinker_info(video['contentUrl'], video_id) - self._sort_formats(relinker_info['formats']) - - thumbnails = [] - if 'images' in media: - for _, value in media.get('images').items(): - if value: - thumbnails.append({ - 'url': value.replace('[RESOLUTION]', '600x400') - }) - - timestamp = unified_timestamp(try_get( - media, lambda x: x['availabilities'][0]['start'], compat_str)) - - subtitles = self._extract_subtitles(url, video.get('subtitles')) - - info = { - 'id': video_id, - 'title': title, - 'alt_title': media.get('subtitle'), - 'description': media.get('description'), - 'uploader': media.get('channel'), - 'creator': media.get('editor'), - 'timestamp': timestamp, - 'thumbnails': thumbnails, - 'subtitles': subtitles, + return { + '_type': 'url_transparent', + 'url': 'http://www.raiplay.it/dirette/ContentItem-%s.html' % video_id, + 'ie_key': RaiPlayIE.ie_key() } - info.update(relinker_info) - return info - class RaiIE(RaiBaseIE): _VALID_URL = r'https?://[^/]+\.(?:rai\.(?:it|tv)|rainews\.it)/dl/.+?-(?P%s)(?:-.+?)?\.html' % RaiBaseIE._UUID_RE