xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 06:10:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ie/mediasite] Fix extraction (#10273)

Browse Source 
Fix regression in add96eb9f8

Closes #10270
Authored by: bashonly
This commit is contained in:
bashonly 2024-06-26 18:57:34 -05:00 committed by GitHub
parent b758877afa
commit 0953209a85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yt_dlp/extractor/mediasite.py
View File

@ -15,6 +15,7 @@
url_or_none, url_or_none,
urljoin, urljoin,
) )
from ..utils.traversal import traverse_obj
_ID_RE = r'(?:[0-9a-f]{32,34}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12,14})' _ID_RE = r'(?:[0-9a-f]{32,34}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12,14})'
@ -212,13 +213,14 @@ def _real_extract(self, url):
stream_type, 'type%u' % stream_type) stream_type, 'type%u' % stream_type)
stream_formats = [] stream_formats = []
for unum, video_url in enumerate(video_urls): for unum, video in enumerate(video_urls):
video_url = url_or_none(video_url.get('Location')) video_url = url_or_none(video.get('Location'))
if not video_url: if not video_url:
continue continue
# XXX: if Stream.get('CanChangeScheme', False), switch scheme to HTTP/HTTPS # XXX: if Stream.get('CanChangeScheme', False), switch scheme to HTTP/HTTPS
media_type = video_url.get('MediaType') media_type = video.get('MediaType')
ext = mimetype2ext(video.get('MimeType'))
if media_type == 'SS': if media_type == 'SS':
stream_formats.extend(self._extract_ism_formats( stream_formats.extend(self._extract_ism_formats(
video_url, resource_id, video_url, resource_id,
@ -229,15 +231,20 @@ def _real_extract(self, url):
video_url, resource_id, video_url, resource_id,
mpd_id=f'{stream_id}-{snum}.{unum}', mpd_id=f'{stream_id}-{snum}.{unum}',
fatal=False)) fatal=False))
elif ext in ('m3u', 'm3u8'):
stream_formats.extend(self._extract_m3u8_formats(
video_url, resource_id,
m3u8_id=f'{stream_id}-{snum}.{unum}',
fatal=False))
else: else:
stream_formats.append({ stream_formats.append({
'format_id': f'{stream_id}-{snum}.{unum}', 'format_id': f'{stream_id}-{snum}.{unum}',
'url': video_url, 'url': video_url,
'ext': mimetype2ext(video_url.get('MimeType')), 'ext': ext,
}) })
if stream.get('HasSlideContent', False): images = traverse_obj(player_options, ('PlayerLayoutOptions', 'Images', {dict}))
images = player_options['PlayerLayoutOptions']['Images'] if stream.get('HasSlideContent') and images:
stream_formats.append(self.__extract_slides( stream_formats.append(self.__extract_slides(
stream_id=stream_id, stream_id=stream_id,
snum=snum, snum=snum,