yt_dlp/extractor/nuum.py

@@ -5,7 +5,6 @@ from ..utils import (
     ExtractorError,
     OnDemandPagedList,
     UserNotLive,
-    filter_dict,
     int_or_none,
     parse_iso8601,
     str_or_none,
@@ -15,6 +14,7 @@ from ..utils.traversal import traverse_obj
 
 
 class NuumBaseIE(InfoExtractor):
+
     def _call_api(self, path, video_id, description, query={}):
         response = self._download_json(
             f'https://nuum.ru/api/v2/{path}', video_id, query=query,
@@ -22,7 +22,7 @@ class NuumBaseIE(InfoExtractor):
             errnote=f'Unable to download {description} metadata')
         if error := response.get('error'):
             raise ExtractorError(f'API returned error: {error!r}')
-        return response['result']
+        return response.get('result')
 
     def _get_channel_info(self, channel_name):
         return self._call_api(
@@ -33,25 +33,15 @@ class NuumBaseIE(InfoExtractor):
                 'with_deleted': 'true',
             })
 
-    def _parse_video_data(self, container, extract_formats=True):
+    def _parse_video_data(self, container):
-        stream = traverse_obj(container, ('media_container_streams', 0, {dict})) or {}
+        stream = traverse_obj(container, ('media_container_streams', 0))
-        media = traverse_obj(stream, ('stream_media', 0, {dict})) or {}
+        media = traverse_obj(stream, ('stream_media', 0))
         media_url = traverse_obj(media, (
             'media_meta', ('media_archive_url', 'media_url'), {url_or_none}), get_all=False)
 
-        video_id = str(container['media_container_id'])
+        return media_url, {
-        is_live = media.get('media_status') == 'RUNNING'
+            'id': str(container['media_container_id']),
-
+            'is_live': media.get('media_status') == 'RUNNING',
-        formats, subtitles = None, None
-        if extract_formats:
-            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-                media_url, video_id, 'mp4', live=is_live)
-
-        return filter_dict({
-            'id': video_id,
-            'is_live': is_live,
-            'formats': formats,
-            'subtitles': subtitles,
             **traverse_obj(container, {
                 'title': ('media_container_name', {str}),
                 'description': ('media_container_description', {str}),
@@ -67,7 +57,7 @@ class NuumBaseIE(InfoExtractor):
                 'duration': ('media_duration', {int_or_none}),
                 'thumbnail': ('media_meta', ('media_preview_archive_url', 'media_preview_url'), {url_or_none}),
             }, get_all=False),
-        })
+        }
 
 
 class NuumMediaIE(NuumBaseIE):
@@ -115,7 +105,15 @@ class NuumMediaIE(NuumBaseIE):
         video_id = self._match_id(url)
         video_data = self._call_api(f'media-containers/{video_id}', video_id, 'media')
 
-        return self._parse_video_data(video_data)
+        m3u8_url, info = self._parse_video_data(video_data)
+
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            m3u8_url, video_id, 'mp4', live=info['is_live'])
+        info.update({
+            'formats': formats,
+            'subtitles': subtitles,
+        })
+        return info
 
 
 class NuumLiveIE(NuumBaseIE):
@@ -132,12 +130,15 @@ class NuumLiveIE(NuumBaseIE):
         if traverse_obj(channel_info, ('channel', 'channel_is_live')) is False:
             raise UserNotLive(video_id=channel)
 
-        info = self._parse_video_data(channel_info['media_container'])
+        m3u8_url, metadata = self._parse_video_data(channel_info['media_container'])
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, channel, 'mp4', live=True)
         return {
-            'webpage_url': f'https://nuum.ru/streams/{info["id"]}',
+            'formats': formats,
+            'subtitles': subtitles,
+            'webpage_url': f'https://nuum.ru/streams/{metadata["id"]}',
             'extractor_key': NuumMediaIE.ie_key(),
             'extractor': NuumMediaIE.IE_NAME,
-            **info,
+            **metadata,
         }
 
 
@@ -164,7 +165,7 @@ class NuumTabIE(NuumBaseIE):
             'id': 'dankon__streams',
             'title': 'Dankon_',
         },
-        'playlist_mincount': 1,
+        'playlist_mincount': 5,
     }]
 
     _PAGE_SIZE = 50
@@ -186,7 +187,7 @@ class NuumTabIE(NuumBaseIE):
                 'media_container_type': CONTAINER_TYPES[tab_type],
             })
         for container in traverse_obj(media_containers, (..., {dict})):
-            metadata = self._parse_video_data(container, extract_formats=False)
+            _, metadata = self._parse_video_data(container)
             yield self.url_result(f'https://nuum.ru/videos/{metadata["id"]}', NuumMediaIE, **metadata)
 
     def _real_extract(self, url):