xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-23 19:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

[mediaset] Add support for new videos

Browse Source
This commit is contained in:
Timendum 2018-06-18 11:50:06 +02:00 committed by Sergey M․
parent 5e8e2fa51f
commit 9cf648c92b
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
youtube_dl/extractor/mediaset.py
View File

@ -10,6 +10,7 @@ from ..utils import (
parse_duration, parse_duration,
try_get, try_get,
unified_strdate, unified_strdate,
ExtractorError
) )
@ -42,6 +43,22 @@ class MediasetIE(InfoExtractor):
'categories': ['reality'], 'categories': ['reality'],
}, },
'expected_warnings': ['is not a supported codec'], 'expected_warnings': ['is not a supported codec'],
}, {
'url': 'http://www.video.mediaset.it/video/matrix/full_chiambretti/puntata-del-25-maggio_846685.html',
'md5': '1276f966ac423d16ba255ce867de073e',
'info_dict': {
'id': '846685',
'ext': 'mp4',
'title': 'Puntata del 25 maggio',
'description': 'md5:ee2e456e3eb1dba5e814596655bb5296',
'thumbnail': r're:^https?://.*\.jpg$',
'duration': 6565,
'creator': 'mediaset',
'upload_date': '20180525',
'series': 'Matrix',
'categories': ['infotainment'],
},
'expected_warnings': ['is not a supported codec'],
}, { }, {
# clip # clip
'url': 'http://www.video.mediaset.it/video/gogglebox/clip/un-grande-classico-della-commedia-sexy_661680.html', 'url': 'http://www.video.mediaset.it/video/gogglebox/clip/un-grande-classico-della-commedia-sexy_661680.html',
@ -70,18 +87,29 @@ class MediasetIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
media_info = self._download_json(
'https://www.video.mediaset.it/html/metainfo.sjson',
video_id, 'Downloading media info', query={
'id': video_id
})['video']
media_id = try_get(media_info, lambda x: x['guid']) or video_id
video_list = self._download_json( video_list = self._download_json(
'http://cdnsel01.mediaset.net/GetCdn.aspx', 'http://cdnsel01.mediaset.net/GetCdn2018.aspx',
video_id, 'Downloading video CDN JSON', query={ video_id, 'Downloading video CDN JSON', query={
'streamid': video_id, 'streamid': media_id,
'format': 'json', 'format': 'json',
})['videoList'] })['videoList']
formats = [] formats = []
for format_url in video_list: for format_url in video_list:
if '.ism' in format_url: if '.ism' in format_url:
formats.extend(self._extract_ism_formats( try:
format_url, video_id, ism_id='mss', fatal=False)) formats.extend(self._extract_ism_formats(
format_url, video_id, ism_id='mss', fatal=False))
except ExtractorError:
pass
else: else:
formats.append({ formats.append({
'url': format_url, 'url': format_url,
@ -89,30 +117,24 @@ class MediasetIE(InfoExtractor):
}) })
self._sort_formats(formats) self._sort_formats(formats)
mediainfo = self._download_json( title = media_info['title']
'http://plr.video.mediaset.it/html/metainfo.sjson',
video_id, 'Downloading video info JSON', query={
'id': video_id,
})['video']
title = mediainfo['title']
creator = try_get( creator = try_get(
mediainfo, lambda x: x['brand-info']['publisher'], compat_str) media_info, lambda x: x['brand-info']['publisher'], compat_str)
category = try_get( category = try_get(
mediainfo, lambda x: x['brand-info']['category'], compat_str) media_info, lambda x: x['brand-info']['category'], compat_str)
categories = [category] if category else None categories = [category] if category else None
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': mediainfo.get('short-description'), 'description': media_info.get('short-description'),
'thumbnail': mediainfo.get('thumbnail'), 'thumbnail': media_info.get('thumbnail'),
'duration': parse_duration(mediainfo.get('duration')), 'duration': parse_duration(media_info.get('duration')),
'creator': creator, 'creator': creator,
'upload_date': unified_strdate(mediainfo.get('production-date')), 'upload_date': unified_strdate(media_info.get('production-date')),
'webpage_url': mediainfo.get('url'), 'webpage_url': media_info.get('url'),
'series': mediainfo.get('brand-value'), 'series': media_info.get('brand-value'),
'categories': categories, 'categories': categories,
'formats': formats, 'formats': formats,
} }