[cleanup] Fix infodict returned fields (#8906)

[yt-dlp.git] / yt_dlp / extractor / steam.py

diff --git a/yt_dlp/extractor/steam.py b/yt_dlp/extractor/steam.py
index 4ed0fb592af24afd79cb875eb600bb366984fa8f..63da9662adef5543c41cf9621a0858052a7ec84b 100644 (file)
--- a/yt_dlp/extractor/steam.py
+++ b/yt_dlp/extractor/steam.py
@@ -1,12 +1,11 @@
-from __future__ import unicode_literals
-
 import re
 
 from .common import InfoExtractor
 from ..utils import (
-    extract_attributes,
     ExtractorError,
+    extract_attributes,
     get_element_by_class,
+    str_or_none,
 )
 
 
@@ -32,7 +31,6 @@ class SteamIE(InfoExtractor):
                     'ext': 'mp4',
                     'title': 'Terraria video 256785003',
                     'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
-                    'n_entries': 2,
                 }
             },
             {
@@ -41,9 +39,7 @@ class SteamIE(InfoExtractor):
                     'id': '2040428',
                     'ext': 'mp4',
                     'title': 'Terraria video 2040428',
-                    'playlist_index': 2,
                     'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
-                    'n_entries': 2,
                 }
             }
         ],
@@ -57,12 +53,10 @@ class SteamIE(InfoExtractor):
     }, {
         'url': 'https://store.steampowered.com/app/271590/Grand_Theft_Auto_V/',
         'info_dict': {
-            'id': '256757115',
-            'title': 'Grand Theft Auto V video 256757115',
-            'ext': 'mp4',
-            'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
-            'n_entries': 20,
+            'id': '271590',
+            'title': 'Grand Theft Auto V',
         },
+        'playlist_count': 23,
     }]
 
     def _real_extract(self, url):
@@ -111,7 +105,6 @@ def _real_extract(self, url):
                                 'format_id': ext + quality,
                                 'url': video_url,
                             })
-            self._sort_formats(formats)
             entry['formats'] = formats
             entries.append(entry)
         embedded_videos = re.findall(r'(<iframe[^>]+>)', webpage)
@@ -129,3 +122,49 @@ def _real_extract(self, url):
             raise ExtractorError('Could not find any videos')
 
         return self.playlist_result(entries, playlist_id, playlist_title)
+
+
+class SteamCommunityBroadcastIE(InfoExtractor):
+    _VALID_URL = r'https?://steamcommunity\.(?:com)/broadcast/watch/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://steamcommunity.com/broadcast/watch/76561199073851486',
+        'info_dict': {
+            'id': '76561199073851486',
+            'title': r're:Steam Community :: pepperm!nt :: Broadcast 2022-06-26 \d{2}:\d{2}',
+            'ext': 'mp4',
+            'uploader_id': '1113585758',
+            'uploader': 'pepperm!nt',
+            'live_status': 'is_live',
+        },
+        'skip': 'Stream has ended',
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        json_data = self._download_json(
+            'https://steamcommunity.com/broadcast/getbroadcastmpd/',
+            video_id, query={'steamid': f'{video_id}'})
+
+        formats, subs = self._extract_m3u8_formats_and_subtitles(json_data['hls_url'], video_id)
+
+        ''' # We cannot download live dash atm
+        mpd_formats, mpd_subs = self._extract_mpd_formats_and_subtitles(json_data['url'], video_id)
+        formats.extend(mpd_formats)
+        self._merge_subtitles(mpd_subs, target=subs)
+        '''
+
+        uploader_json = self._download_json(
+            'https://steamcommunity.com/actions/ajaxresolveusers',
+            video_id, query={'steamids': video_id})[0]
+
+        return {
+            'id': video_id,
+            'title': self._generic_title('', webpage),
+            'formats': formats,
+            'live_status': 'is_live',
+            'view_count': json_data.get('num_view'),
+            'uploader': uploader_json.get('persona_name'),
+            'uploader_id': str_or_none(uploader_json.get('accountid')),
+            'subtitles': subs,
+        }