mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
[extractor/RUTV] Fix warnings for livestreams (#5016)
Authored by: Lesmiscore
This commit is contained in:
parent
faf7863bb0
commit
5c8b2ee9ec
@ -141,7 +141,7 @@ def _real_extract(self, url):
|
||||
if media['errors']:
|
||||
raise ExtractorError('%s said: %s' % (self.IE_NAME, media['errors']), expected=True)
|
||||
|
||||
view_count = playlist.get('count_views')
|
||||
view_count = int_or_none(playlist.get('count_views'))
|
||||
priority_transport = playlist['priority_transport']
|
||||
|
||||
thumbnail = media['picture']
|
||||
@ -152,6 +152,7 @@ def _real_extract(self, url):
|
||||
duration = int_or_none(media.get('duration'))
|
||||
|
||||
formats = []
|
||||
subtitles = {}
|
||||
|
||||
for transport, links in media['sources'].items():
|
||||
for quality, url in links.items():
|
||||
@ -171,8 +172,10 @@ def _real_extract(self, url):
|
||||
'vbr': str_to_int(quality),
|
||||
}
|
||||
elif transport == 'm3u8':
|
||||
formats.extend(self._extract_m3u8_formats(
|
||||
url, video_id, 'mp4', quality=preference, m3u8_id='hls'))
|
||||
fmt, subs = self._extract_m3u8_formats_and_subtitles(
|
||||
url, video_id, 'mp4', quality=preference, m3u8_id='hls')
|
||||
formats.extend(fmt)
|
||||
self._merge_subtitles(subs, target=subtitles)
|
||||
continue
|
||||
else:
|
||||
fmt = {
|
||||
@ -186,7 +189,7 @@ def _real_extract(self, url):
|
||||
})
|
||||
formats.append(fmt)
|
||||
|
||||
self._sort_formats(formats)
|
||||
self._sort_formats(formats, ('source', ))
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
@ -196,5 +199,6 @@ def _real_extract(self, url):
|
||||
'view_count': view_count,
|
||||
'duration': duration,
|
||||
'formats': formats,
|
||||
'subtitles': subtitles,
|
||||
'is_live': is_live,
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user