mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-13 00:38:33 +00:00
Code Issues Projects Releases Wiki Activity

[extractor/echo360] little code cleanup; do not fail if video duration

Browse Source 
is not found
This commit is contained in:
c0d3d3v 2023-03-11 14:05:16 +01:00
parent 6f258afb55
commit a2e9c5ba97
No known key found for this signature in database
GPG Key ID: 068AF680530DFF31
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
yt_dlp/extractor/echo360.py
View File

@ -4,6 +4,7 @@
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
ExtractorError, ExtractorError,
float_or_none,
traverse_obj, traverse_obj,
variadic, variadic,
) )
@ -21,11 +22,8 @@ class Echo360BaseIE(InfoExtractor):
def _call_api(self, host, video_id, media_id, session_token, **kwargs): def _call_api(self, host, video_id, media_id, session_token, **kwargs):
return self._download_json( return self._download_json(
self._API_BASE % (host, video_id, media_id), self._API_BASE % (host, video_id, media_id), video_id,
video_id, headers={'Authorization': f'Bearer {session_token}'}, **kwargs)
headers={'Authorization': f'Bearer {session_token}'},
**kwargs,
)
@staticmethod @staticmethod
def _update_url_query(uri, query_string): def _update_url_query(uri, query_string):
@ -45,8 +43,10 @@ def _parse_mediapackage(self, video):
video_id = traverse_obj(video, ('playableAudioVideo', 'mediaId')) video_id = traverse_obj(video, ('playableAudioVideo', 'mediaId'))
if video_id is None: if video_id is None:
raise ExtractorError('Video id was not found') raise ExtractorError('Video id was not found')
query_strings = variadic(traverse_obj(video, ('sourceQueryStrings', 'queryStrings')) or []) query_strings = traverse_obj(video, ('sourceQueryStrings', 'queryStrings')) or []
duration = float(re.match(r'PT(\d+\.?\d+)S', traverse_obj(video, ('playableAudioVideo', 'duration')))[1]) duration = float_or_none(self._search_regex(
r'PT(\d+\.?\d+)S', traverse_obj(video, ('playableAudioVideo', 'duration')),
'video duration', default=None, fatal=False))
formats = [] formats = []
for track in variadic(traverse_obj(video, ('playableAudioVideo', 'playableMedias')) or []): for track in variadic(traverse_obj(video, ('playableAudioVideo', 'playableMedias')) or []):
@ -54,20 +54,15 @@ def _parse_mediapackage(self, video):
if href is None: if href is None:
continue continue
href = self._update_url_query(href, self._get_query_string(href, query_strings)) href = self._update_url_query(href, self._get_query_string(href, query_strings))
ext = determine_ext(href, None) if track.get('isHls') or determine_ext(href, None) == 'm3u8':
is_hls = track.get('isHls')
is_live = track.get('isLive')
if is_hls or ext == 'm3u8':
hls_formats = self._extract_m3u8_formats( hls_formats = self._extract_m3u8_formats(
href, video_id, live=is_live, m3u8_id='hls', entry_protocol='m3u8_native', fatal=False href, video_id, live=track.get('isLive'), m3u8_id='hls', entry_protocol='m3u8_native', fatal=False
) )
for hls_format in hls_formats: for hls_format in hls_formats:
query_string = self._get_query_string(hls_format['url'], query_strings) query_string = self._get_query_string(hls_format['url'], query_strings)
if query_string is not None: hls_format['extra_param_to_segment_url'] = query_string
hls_format['extra_param_to_segment_url'] = query_string hls_format['url'] = self._update_url_query(hls_format['url'], query_string)
hls_format['url'] = self._update_url_query(hls_format['url'], query_string)
formats.extend(hls_formats) formats.extend(hls_formats)