dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[raiplay:live] Improve and add test (closes #13414)

This commit is contained in:
Sergey M․ 2017-06-25 01:48:02 +07:00
parent 449c665776
commit 9c48b5a193
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
youtube_dl/extractor/rai.py
View File

@ -191,11 +191,12 @@ class RaiPlayIE(RaiBaseIE):
info = { info = {
'id': video_id, 'id': video_id,
'title': title, 'title': self._live_title(title) if relinker_info.get(
'is_live') else title,
'alt_title': media.get('subtitle'), 'alt_title': media.get('subtitle'),
'description': media.get('description'), 'description': media.get('description'),
'uploader': media.get('channel'), 'uploader': strip_or_none(media.get('channel')),
'creator': media.get('editor'), 'creator': strip_or_none(media.get('editor')),
'duration': parse_duration(video.get('duration')), 'duration': parse_duration(video.get('duration')),
'timestamp': timestamp, 'timestamp': timestamp,
'thumbnails': thumbnails, 'thumbnails': thumbnails,
@ -212,21 +213,40 @@ class RaiPlayIE(RaiBaseIE):
class RaiPlayLiveIE(RaiBaseIE): class RaiPlayLiveIE(RaiBaseIE):
_VALID_URL = r'https?://(?:www\.)?raiplay\.it/dirette/(?P<id>\w*)' _VALID_URL = r'https?://(?:www\.)?raiplay\.it/dirette/(?P<id>[^/?#&]+)'
_TEST = { _TEST = {
'url': 'http://www.raiplay.it/dirette/rai3', 'url': 'http://www.raiplay.it/dirette/rainews24',
'only_matching': True, 'info_dict': {
'id': 'd784ad40-e0ae-4a69-aa76-37519d238a9c',
'display_id': 'rainews24',
'ext': 'mp4',
'title': 're:^Diretta di Rai News 24 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'description': 'md5:6eca31500550f9376819f174e5644754',
'uploader': 'Rai News 24',
'creator': 'Rai News 24',
'is_live': True,
},
'params': {
'skip_download': True,
},
} }
def _real_extract(self, url): def _real_extract(self, url):
channel = self._match_id(url) display_id = self._match_id(url)
webpage = self._download_webpage(url, channel) webpage = self._download_webpage(url, display_id)
re_id = r'<div([^>]*)data-uniquename=(["\'])[\w-]*(?P<id>%s)(\2)([^>]*?)>' % RaiBaseIE._UUID_RE
video_id = self._html_search_regex(re_id, webpage, 'livestream-id', group='id')
return self.url_result('http://www.raiplay.it/dirette/ContentItem-%s.html' % video_id, video_id = self._search_regex(
RaiPlayIE.ie_key(), video_id) r'data-uniquename=["\']ContentItem-(%s)' % RaiBaseIE._UUID_RE,
webpage, 'content id')
return {
'_type': 'url_transparent',
'ie_key': RaiPlayIE.ie_key(),
'url': 'http://www.raiplay.it/dirette/ContentItem-%s.html' % video_id,
'id': video_id,
'display_id': display_id,
}
class RaiIE(RaiBaseIE): class RaiIE(RaiBaseIE):