mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-22 18:31:25 +02:00
Compare commits
2 Commits
8ad7e94835
...
2d096b96b8
Author | SHA1 | Date | |
---|---|---|---|
|
2d096b96b8 | ||
|
e22f880c6d |
|
@ -194,7 +194,7 @@ class ZenYandexIE(InfoExtractor):
|
||||||
'id': '60c7c443da18892ebfe85ed7',
|
'id': '60c7c443da18892ebfe85ed7',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'ВОТ ЭТО Focus. Деды Морозы на гидроциклах',
|
'title': 'ВОТ ЭТО Focus. Деды Морозы на гидроциклах',
|
||||||
'description': 'md5:f3db3d995763b9bbb7b56d4ccdedea89',
|
'description': 'md5:8684912f6086f298f8078d4af0e8a600',
|
||||||
'thumbnail': 're:^https://avatars.dzeninfra.ru/',
|
'thumbnail': 're:^https://avatars.dzeninfra.ru/',
|
||||||
'uploader': 'AcademeG DailyStream'
|
'uploader': 'AcademeG DailyStream'
|
||||||
},
|
},
|
||||||
|
@ -209,7 +209,7 @@ class ZenYandexIE(InfoExtractor):
|
||||||
'id': '60c7c443da18892ebfe85ed7',
|
'id': '60c7c443da18892ebfe85ed7',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'ВОТ ЭТО Focus. Деды Морозы на гидроциклах',
|
'title': 'ВОТ ЭТО Focus. Деды Морозы на гидроциклах',
|
||||||
'description': 'md5:f3db3d995763b9bbb7b56d4ccdedea89',
|
'description': 'md5:8684912f6086f298f8078d4af0e8a600',
|
||||||
'thumbnail': r're:^https://avatars\.dzeninfra\.ru/',
|
'thumbnail': r're:^https://avatars\.dzeninfra\.ru/',
|
||||||
'uploader': 'AcademeG DailyStream',
|
'uploader': 'AcademeG DailyStream',
|
||||||
'upload_date': '20191111',
|
'upload_date': '20191111',
|
||||||
|
@ -266,22 +266,25 @@ class ZenYandexIE(InfoExtractor):
|
||||||
uploader_name = extract_attributes(uploader).get('aria-label')
|
uploader_name = extract_attributes(uploader).get('aria-label')
|
||||||
video_json = try_get(data_json, lambda x: x[serverstate]['exportData']['video'], dict)
|
video_json = try_get(data_json, lambda x: x[serverstate]['exportData']['video'], dict)
|
||||||
stream_urls = try_get(video_json, lambda x: x['video']['streams'])
|
stream_urls = try_get(video_json, lambda x: x['video']['streams'])
|
||||||
formats = []
|
formats, subtitles = [], {}
|
||||||
for s_url in stream_urls:
|
for s_url in stream_urls:
|
||||||
ext = determine_ext(s_url)
|
ext = determine_ext(s_url)
|
||||||
if ext == 'mpd':
|
if ext == 'mpd':
|
||||||
formats.extend(self._extract_mpd_formats(s_url, video_id, mpd_id='dash'))
|
fmts, subs = self._extract_mpd_formats_and_subtitles(s_url, video_id, mpd_id='dash')
|
||||||
elif ext == 'm3u8':
|
elif ext == 'm3u8':
|
||||||
formats.extend(self._extract_m3u8_formats(s_url, video_id, 'mp4'))
|
fmts, subs = self._extract_m3u8_formats_and_subtitles(s_url, video_id, 'mp4')
|
||||||
|
formats.extend(fmts)
|
||||||
|
subtitles = self._merge_subtitles(subtitles, subs)
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': video_json.get('title') or self._og_search_title(webpage),
|
'title': video_json.get('title') or self._og_search_title(webpage),
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
|
'subtitles': subtitles,
|
||||||
'duration': int_or_none(video_json.get('duration')),
|
'duration': int_or_none(video_json.get('duration')),
|
||||||
'view_count': int_or_none(video_json.get('views')),
|
'view_count': int_or_none(video_json.get('views')),
|
||||||
'timestamp': int_or_none(video_json.get('publicationDate')),
|
'timestamp': int_or_none(video_json.get('publicationDate')),
|
||||||
'uploader': uploader_name or data_json.get('authorName') or try_get(data_json, lambda x: x['publisher']['name']),
|
'uploader': uploader_name or data_json.get('authorName') or try_get(data_json, lambda x: x['publisher']['name']),
|
||||||
'description': self._og_search_description(webpage) or try_get(data_json, lambda x: x['og']['description']),
|
'description': video_json.get('description') or self._og_search_description(webpage),
|
||||||
'thumbnail': self._og_search_thumbnail(webpage) or try_get(data_json, lambda x: x['og']['imageUrl']),
|
'thumbnail': self._og_search_thumbnail(webpage) or try_get(data_json, lambda x: x['og']['imageUrl']),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,7 +321,7 @@ class ZenYandexChannelIE(InfoExtractor):
|
||||||
'url': 'https://zen.yandex.ru/jony_me',
|
'url': 'https://zen.yandex.ru/jony_me',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'jony_me',
|
'id': 'jony_me',
|
||||||
'description': 'md5:a2c62b4ef5cf3e3efb13d25f61f739e1',
|
'description': 'md5:ce0a5cad2752ab58701b5497835b2cc5',
|
||||||
'title': 'JONY ',
|
'title': 'JONY ',
|
||||||
},
|
},
|
||||||
'playlist_count': 20,
|
'playlist_count': 20,
|
||||||
|
@ -328,7 +331,7 @@ class ZenYandexChannelIE(InfoExtractor):
|
||||||
'url': 'https://zen.yandex.ru/tatyanareva',
|
'url': 'https://zen.yandex.ru/tatyanareva',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'tatyanareva',
|
'id': 'tatyanareva',
|
||||||
'description': 'md5:296b588d60841c3756c9105f237b70c6',
|
'description': 'md5:40a1e51f174369ec3ba9d657734ac31f',
|
||||||
'title': 'Татьяна Рева',
|
'title': 'Татьяна Рева',
|
||||||
'entries': 'maxcount:200',
|
'entries': 'maxcount:200',
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue
Block a user