From f6e97090d2ed9e05441ab0f4bec3559b816d7a00 Mon Sep 17 00:00:00 2001 From: bashonly <88596187+bashonly@users.noreply.github.com> Date: Sat, 11 Nov 2023 14:05:07 -0600 Subject: [PATCH] [ie/twitter:broadcast] Support `--wait-for-video` (#8475) Closes #8473 Authored by: bashonly --- yt_dlp/extractor/periscope.py | 9 ++++++--- yt_dlp/extractor/twitter.py | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/yt_dlp/extractor/periscope.py b/yt_dlp/extractor/periscope.py index dcd021926..3d1375b64 100644 --- a/yt_dlp/extractor/periscope.py +++ b/yt_dlp/extractor/periscope.py @@ -4,6 +4,7 @@ parse_iso8601, unescapeHTML, ) +from ..utils.traversal import traverse_obj class PeriscopeBaseIE(InfoExtractor): @@ -20,8 +21,6 @@ def _parse_broadcast_data(self, broadcast, video_id): title = broadcast.get('status') or 'Periscope Broadcast' uploader = broadcast.get('user_display_name') or broadcast.get('username') title = '%s - %s' % (uploader, title) if uploader else title - is_live = broadcast.get('state').lower() == 'running' - thumbnails = [{ 'url': broadcast[image], } for image in ('image_url', 'image_url_medium', 'image_url_small') if broadcast.get(image)] @@ -31,12 +30,16 @@ def _parse_broadcast_data(self, broadcast, video_id): 'title': title, 'timestamp': parse_iso8601(broadcast.get('created_at')) or int_or_none( broadcast.get('created_at_ms'), scale=1000), + 'release_timestamp': int_or_none(broadcast.get('scheduled_start_ms'), scale=1000), 'uploader': uploader, 'uploader_id': broadcast.get('user_id') or broadcast.get('username'), 'thumbnails': thumbnails, 'view_count': int_or_none(broadcast.get('total_watched')), 'tags': broadcast.get('tags'), - 'is_live': is_live, + 'live_status': { + 'running': 'is_live', + 'not_started': 'is_upcoming', + }.get(traverse_obj(broadcast, ('state', {str.lower}))) or 'was_live' } @staticmethod diff --git a/yt_dlp/extractor/twitter.py b/yt_dlp/extractor/twitter.py index 7bd78eb48..d7609bc81 100644 --- a/yt_dlp/extractor/twitter.py +++ b/yt_dlp/extractor/twitter.py @@ -1619,6 +1619,9 @@ def _real_extract(self, url): info['title'] = broadcast.get('status') or info.get('title') info['uploader_id'] = broadcast.get('twitter_username') or info.get('uploader_id') info['uploader_url'] = format_field(broadcast, 'twitter_username', 'https://twitter.com/%s', default=None) + if info['live_status'] == 'is_upcoming': + return info + media_key = broadcast['media_key'] source = self._call_api( f'live_video_stream/status/{media_key}', media_key)['source']