[extractor/echo360] Apply most suggestions by @HobbyistDev

yt_dlp/extractor/echo360.py

@@ -3,14 +3,13 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     determine_ext,
-    ExtractorError,
     float_or_none,
     traverse_obj,
     variadic,
 )
 
 
-class Echo360BaseIE(InfoExtractor):
+class Echo360IE(InfoExtractor):
     _INSTANCES_RE = r'''(?:
                             echo360\.ca|
                             echo360\.net\.au|
@@ -19,6 +18,34 @@ class Echo360BaseIE(InfoExtractor):
                             echo360\.org|
                         )'''
     _UUID_RE = r'[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}'
+    _VALID_URL = rf'''(?x)
+        https?://(?P<host>{_INSTANCES_RE})
+        /media/(?P<id>{_UUID_RE})/public'''
+
+    _API_BASE = 'https://%s/api/ui/echoplayer/public-links/%s/media/%s/player-properties'
+
+    _TESTS = [
+        {
+            'url': 'https://echo360.org.uk/media/1d8392aa-a3e7-4e78-94cf-b6532c27208c/public',
+            'info_dict': {
+                'id': '3c7ae6e0-fa19-432d-aa21-c283b4276f2a',
+                'ext': 'mp4',
+                'title': '3-4 Force + moment + mechanics.mp4',
+                'duration': 4731.888,
+            },
+            'params': {'skip_download': 'm3u8'}
+        },
+        {
+            'url': 'https://echo360.net.au/media/f04960a9-2efc-4b63-87b5-72e629081d15/public',
+            'info_dict': {
+                'id': '6098a147-2d65-40f3-b9e9-a0204afe450c',
+                'ext': 'mp4',
+                'title': 'EXSC634_Online_Workshop_Week_4.mp4',
+                'duration': 6659.72,
+            },
+            'params': {'skip_download': 'm3u8'}
+        },
+    ]
 
     def _call_api(self, host, video_id, media_id, session_token, **kwargs):
         return self._download_json(
@@ -40,13 +67,8 @@ class Echo360BaseIE(InfoExtractor):
         return None
 
     def _parse_mediapackage(self, video):
-        video_id = traverse_obj(video, ('playableAudioVideo', 'mediaId'))
-        if video_id is None:
-            raise ExtractorError('Video id was not found')
+        video_id = video['playableAudioVideo']['mediaId']
         query_strings = traverse_obj(video, ('sourceQueryStrings', 'queryStrings')) or []
-        duration = float_or_none(self._search_regex(
-            r'PT(\d+\.?\d+)S', traverse_obj(video, ('playableAudioVideo', 'duration')),
-            'video duration', default=None, fatal=False))
 
         formats = []
         for track in variadic(traverse_obj(video, ('playableAudioVideo', 'playableMedias')) or []):
@@ -70,40 +92,11 @@ class Echo360BaseIE(InfoExtractor):
             'id': video_id,
             'formats': formats,
             'title': video.get('mediaName'),
-            'duration': duration,
+            'duration': float_or_none(self._search_regex(
+                r'PT(\d+\.?\d+)S', traverse_obj(video, ('playableAudioVideo', 'duration')),
+                'video duration', default=None, fatal=False)),
         }
 
-
-class Echo360IE(Echo360BaseIE):
-    _VALID_URL = rf'''(?x)
-        https?://(?P<host>{Echo360BaseIE._INSTANCES_RE})
-        /media/(?P<id>{Echo360BaseIE._UUID_RE})/public'''
-
-    _API_BASE = 'https://%s/api/ui/echoplayer/public-links/%s/media/%s/player-properties'
-
-    _TESTS = [
-        {
-            'url': 'https://echo360.org.uk/media/1d8392aa-a3e7-4e78-94cf-b6532c27208c/public',
-            'info_dict': {
-                'id': '3c7ae6e0-fa19-432d-aa21-c283b4276f2a',
-                'ext': 'mp4',
-                'title': '3-4 Force + moment + mechanics.mp4',
-                'duration': 4731.888,
-            },
-            'params': {'skip_download': 'm3u8'}
-        },
-        {
-            'url': 'https://echo360.net.au/media/f04960a9-2efc-4b63-87b5-72e629081d15/public',
-            'info_dict': {
-                'id': '6098a147-2d65-40f3-b9e9-a0204afe450c',
-                'ext': 'mp4',
-                'title': 'EXSC634_Online_Workshop_Week_4.mp4',
-                'duration': 6659.72,
-            },
-            'params': {'skip_download': 'm3u8'}
-        },
-    ]
-
     def _real_extract(self, url):
         host, video_id = self._match_valid_url(url).group('host', 'id')
         webpage = self._download_webpage(url, video_id)
@@ -112,18 +105,13 @@ class Echo360IE(Echo360BaseIE):
             r'Echo\["mediaPlayerBootstrapApp"\]\("({[^}]*})"\);', webpage, 'player config').replace('\\"', "\""),
             video_id)
 
-        real_video_id = player_config.get('shareLinkId') or player_config.get('publicLinkId')
-        if real_video_id is None:
-            raise ExtractorError('Video id was not found')
-
         urlh = self._request_webpage(
             f'https://{host}/api/ui/sessions/{player_config["sessionId"]}',
             video_id,
             note='Open video session',
             errnote='Unable to open video session',
         )
-        session_token = urlh.headers.get('Token')
-        if session_token is None:
-            raise ExtractorError('No session token received')
 
-        return self._parse_mediapackage(self._call_api(host, real_video_id, player_config['mediaId'], session_token)['data'])
+        return self._parse_mediapackage(self._call_api(
+            host, player_config.get('shareLinkId') or player_config['publicLinkId'], player_config['mediaId'],
+            urlh.headers['Token'])['data'])