Merge branch 'master' of https://github.com/yt-dlp/yt-dlp into ytdlp

* 'master' of https://github.com/yt-dlp/yt-dlp:
  [NovaEmbed] update player regex (#2008)
  [brightcove] Fix 487c5b3
  [tiktok] Fix 53dad39
  [extractor] Standardize `_live_title`

yt_dlp/YoutubeDL.py

@@ -2822,6 +2822,9 @@ def process_info(self, info_dict):
             if self._num_downloads >= int(max_downloads):
                 raise MaxDownloadsReached()
 
+        if info_dict.get('is_live'):
+            info_dict['title'] += ' ' + datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
+
         # TODO: backward compatibility, to be removed
         info_dict['fulltitle'] = info_dict['title']
 

yt_dlp/extractor/abc.py

@@ -233,8 +233,6 @@ def tokenize_url(url, token):
             }]
 
         is_live = video_params.get('livestream') == '1'
-        if is_live:
-            title = self._live_title(title)
 
         return {
             'id': video_id,

yt_dlp/extractor/adobeconnect.py

@@ -31,7 +31,7 @@ def _real_extract(self, url):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'formats': formats,
             'is_live': is_live,
         }

yt_dlp/extractor/arcpublishing.py

@@ -158,7 +158,7 @@ def _real_extract(self, url):
 
         return {
             'id': uuid,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'thumbnail': try_get(video, lambda x: x['promo_image']['url']),
             'description': try_get(video, lambda x: x['subheadlines']['basic']),
             'formats': formats,

yt_dlp/extractor/ard.py

@@ -280,7 +280,7 @@ def _real_extract(self, url):
 
         info.update({
             'id': video_id,
-            'title': self._live_title(title) if info.get('is_live') else title,
+            'title': title,
             'description': description,
             'thumbnail': thumbnail,
         })

yt_dlp/extractor/awaan.py

@@ -41,7 +41,7 @@ def _parse_video_data(self, video_data, video_id, is_live):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': video_data.get('description_en') or video_data.get('description_ar'),
             'thumbnail': 'http://admin.mangomolo.com/analytics/%s' % img if img else None,
             'duration': int_or_none(video_data.get('duration')),

yt_dlp/extractor/bitwave.py

@@ -51,7 +51,7 @@ def _real_extract(self, url):
 
         return {
             'id': username,
-            'title': self._live_title(channel['data']['title']),
+            'title': channel['data']['title'],
             'uploader': username,
             'uploader_id': username,
             'formats': formats,

yt_dlp/extractor/bongacams.py

@@ -49,7 +49,7 @@ def _real_extract(self, url):
 
         return {
             'id': channel_id,
-            'title': self._live_title(uploader or uploader_id),
+            'title': uploader or uploader_id,
             'uploader': uploader,
             'uploader_id': uploader_id,
             'like_count': like_count,

yt_dlp/extractor/brightcove.py

@@ -581,10 +581,9 @@ def build_format_id(kind):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': clean_html(json_data.get('description')),
-            'thumbnail': json_data.get('thumbnail') or json_data.get('poster'),
-            'thumbnials': thumbnails,
+            'thumbnails': thumbnails,
             'duration': duration,
             'timestamp': parse_iso8601(json_data.get('published_at')),
             'uploader_id': json_data.get('account_id'),

yt_dlp/extractor/cam4.py

@@ -25,7 +25,7 @@ def _real_extract(self, url):
 
         return {
             'id': channel_id,
-            'title': self._live_title(channel_id),
+            'title': channel_id,
             'is_live': True,
             'age_limit': 18,
             'formats': formats,

yt_dlp/extractor/cammodels.py

@@ -91,7 +91,7 @@ def _real_extract(self, url):
 
         return {
             'id': user_id,
-            'title': self._live_title(user_id),
+            'title': user_id,
             'is_live': True,
             'formats': formats,
             'age_limit': 18

yt_dlp/extractor/ceskatelevize.py

@@ -212,8 +212,6 @@ def _real_extract(self, url):
 
                 if playlist_len == 1:
                     final_title = playlist_title or title
-                    if is_live:
-                        final_title = self._live_title(final_title)
                 else:
                     final_title = '%s (%s)' % (playlist_title, title)
 

yt_dlp/extractor/chaturbate.py

@@ -101,7 +101,7 @@ def _real_extract(self, url):
 
         return {
             'id': video_id,
-            'title': self._live_title(video_id),
+            'title': video_id,
             'thumbnail': 'https://roomimg.stream.highwebmedia.com/ri/%s.jpg' % video_id,
             'age_limit': self._rta_search(webpage),
             'is_live': True,

yt_dlp/extractor/common.py

@@ -3,7 +3,6 @@
 
 import base64
 import collections
-import datetime
 import hashlib
 import itertools
 import json
@@ -3512,12 +3511,8 @@ def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
         return formats
 
     def _live_title(self, name):
-        """ Generate the title for a live video """
-        if name is None:
-            return None
-        now = datetime.datetime.now()
-        now_str = now.strftime('%Y-%m-%d %H:%M')
-        return name + ' ' + now_str
+        self._downloader.deprecation_warning('yt_dlp.InfoExtractor._live_title is deprecated and does not work as expected')
+        return name
 
     def _int(self, v, name, fatal=False, **kwargs):
         res = int_or_none(v, **kwargs)

yt_dlp/extractor/dailymotion.py

@@ -305,7 +305,7 @@ def _real_extract(self, url):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': clean_html(media.get('description')),
             'thumbnails': thumbnails,
             'duration': int_or_none(metadata.get('duration')) or None,

yt_dlp/extractor/dlive.py

@@ -84,7 +84,7 @@ def _real_extract(self, url):
         self._sort_formats(formats)
         return {
             'id': display_name,
-            'title': self._live_title(title),
+            'title': title,
             'uploader': display_name,
             'uploader_id': username,
             'formats': formats,

yt_dlp/extractor/douyutv.py

@@ -105,7 +105,7 @@ def _real_extract(self, url):
                 'aid': 'pcclient'
             })['data']['live_url']
 
-        title = self._live_title(unescapeHTML(room['room_name']))
+        title = unescapeHTML(room['room_name'])
         description = room.get('show_details')
         thumbnail = room.get('room_src')
         uploader = room.get('nickname')

yt_dlp/extractor/drtv.py

@@ -321,7 +321,7 @@ def _real_extract(self, url):
         channel_data = self._download_json(
             'https://www.dr.dk/mu-online/api/1.0/channel/' + channel_id,
             channel_id)
-        title = self._live_title(channel_data['Title'])
+        title = channel_data['Title']
 
         formats = []
         for streaming_server in channel_data.get('StreamingServers', []):

yt_dlp/extractor/filmon.py

@@ -170,7 +170,7 @@ def _real_extract(self, url):
         return {
             'id': channel_id,
             'display_id': channel_data.get('alias'),
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': channel_data.get('description'),
             'thumbnails': thumbnails,
             'formats': formats,

yt_dlp/extractor/francetv.py

@@ -203,7 +203,7 @@ def _extract_video(self, video_id, catalogue=None):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'thumbnail': image,
             'duration': duration,
             'timestamp': timestamp,

yt_dlp/extractor/freshlive.py

@@ -59,9 +59,6 @@ def _real_extract(self, url):
             stream_url, video_id, 'mp4',
             'm3u8_native', m3u8_id='hls')
 
-        if is_live:
-            title = self._live_title(title)
-
         return {
             'id': video_id,
             'formats': formats,

yt_dlp/extractor/hitbox.py

@@ -209,6 +209,6 @@ def _real_extract(self, url):
             'https://www.smashcast.tv/api/media/live', video_id)
         metadata['formats'] = formats
         metadata['is_live'] = True
-        metadata['title'] = self._live_title(metadata.get('title'))
+        metadata['title'] = metadata.get('title')
 
         return metadata

yt_dlp/extractor/imggaming.py

@@ -88,7 +88,7 @@ def _real_extract(self, url):
         video_data = self._download_json(dve_api_url, media_id)
         is_live = media_type == 'live'
         if is_live:
-            title = self._live_title(self._call_api('event/', media_id)['title'])
+            title = self._call_api('event/', media_id)['title']
         else:
             title = video_data['name']
 

yt_dlp/extractor/ivideon.py

@@ -75,7 +75,7 @@ def _real_extract(self, url):
 
         return {
             'id': server_id,
-            'title': self._live_title(camera_name or server_id),
+            'title': camera_name or server_id,
             'description': description,
             'is_live': True,
             'formats': formats,

yt_dlp/extractor/laola1tv.py

@@ -112,7 +112,7 @@ def get_flashvar(x, *args, **kwargs):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'upload_date': unified_strdate(_v('time_date')),
             'uploader': _v('meta_organisation'),
             'categories': categories,
@@ -161,7 +161,7 @@ def _extract_video(self, url):
         return {
             'id': video_id,
             'display_id': display_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': video_data.get('description'),
             'thumbnail': video_data.get('image'),
             'categories': categories,

yt_dlp/extractor/line.py

@@ -116,7 +116,7 @@ def _parse_broadcast_item(self, item):
 
         return {
             'id': broadcast_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'thumbnails': thumbnails,
             'timestamp': int_or_none(item.get('createdAt')),
             'channel': channel.get('name'),

yt_dlp/extractor/livestream.py

@@ -176,7 +176,7 @@ def _extract_stream_info(self, stream_info):
         return {
             'id': broadcast_id,
             'formats': formats,
-            'title': self._live_title(stream_info['stream_title']) if is_live else stream_info['stream_title'],
+            'title': stream_info['stream_title'],
             'thumbnail': stream_info.get('thumbnail_url'),
             'is_live': is_live,
         }
@@ -344,7 +344,7 @@ def _real_extract(self, url):
             is_live = video_data.get('isLive')
             info.update({
                 'id': content_id,
-                'title': self._live_title(info['title']) if is_live else info['title'],
+                'title': info['title'],
                 'formats': self._extract_video_formats(video_data, content_id),
                 'is_live': is_live,
             })

yt_dlp/extractor/mangomolo.py

@@ -33,7 +33,7 @@ def _real_extract(self, url):
 
         return {
             'id': page_id,
-            'title': self._live_title(page_id) if self._IS_LIVE else page_id,
+            'title': page_id,
             'uploader_id': hidden_inputs.get('userid'),
             'duration': int_or_none(hidden_inputs.get('duration')),
             'is_live': self._IS_LIVE,

yt_dlp/extractor/matchtv.py

@@ -49,7 +49,7 @@ def _real_extract(self, url):
         self._sort_formats(formats)
         return {
             'id': video_id,
-            'title': self._live_title('Матч ТВ - Прямой эфир'),
+            'title': 'Матч ТВ - Прямой эфир',
             'is_live': True,
             'formats': formats,
         }

yt_dlp/extractor/muenchentv.py

@@ -33,7 +33,7 @@ def _real_extract(self, url):
         display_id = 'live'
         webpage = self._download_webpage(url, display_id)
 
-        title = self._live_title(self._og_search_title(webpage))
+        title = self._og_search_title(webpage)
 
         data_js = self._search_regex(
             r'(?s)\nplaylist:\s*(\[.*?}\]),',

yt_dlp/extractor/nbc.py

@@ -305,7 +305,7 @@ def _real_extract(self, url):
         self._sort_formats(formats)
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': live_source.get('description'),
             'formats': formats,
             'is_live': is_live,
@@ -545,8 +545,6 @@ def _real_extract(self, url):
 
         title = event_config['eventTitle']
         is_live = {'live': True, 'replay': False}.get(event_config.get('eventStatus'))
-        if is_live:
-            title = self._live_title(title)
 
         source_url = self._download_json(
             f'https://api-leap.nbcsports.com/feeds/assets/{pid}?application=NBCOlympics&platform=desktop&format=nbc-player&env=staging',

yt_dlp/extractor/ndr.py

@@ -245,8 +245,6 @@ def _real_extract(self, url):
 
         live = playlist.get('config', {}).get('streamType') in ['httpVideoLive', 'httpAudioLive']
         title = config['title']
-        if live:
-            title = self._live_title(title)
         uploader = ppjson.get('config', {}).get('branding')
         upload_date = ppjson.get('config', {}).get('publicationDate')
         duration = int_or_none(config.get('duration'))

yt_dlp/extractor/nfl.py

@@ -89,7 +89,7 @@ def _parse_video_config(self, video_config, display_id):
                     'ext': determine_ext(image_url, 'jpg'),
                 }]
             info.update({
-                'title': self._live_title(title) if is_live else title,
+                'title': title,
                 'is_live': is_live,
                 'description': clean_html(item.get('description')),
                 'thumbnails': thumbnails,

yt_dlp/extractor/nova.py

@@ -54,7 +54,7 @@ def _real_extract(self, url):
 
         player = self._parse_json(
             self._search_regex(
-                (r'(?:replacePlaceholders.*?:\s*)?replacePlaceholders\s*\(\s*(?P<json>{.*})\s*\)(?:\s*\))?\s*,',
+                (r'(?:(?:replacePlaceholders|processAdTagModifier).*?:\s*)?(?:replacePlaceholders|processAdTagModifier)\s*\(\s*(?P<json>{.*?})\s*\)(?:\s*\))?\s*,',
                     r'Player\.init\s*\([^,]+,(?P<cndn>\s*\w+\s*\?)?\s*(?P<json>{(?(cndn).+?|.+)})\s*(?(cndn):|,\s*{.+?}\s*\)\s*;)'),
                 webpage, 'player', default='{}', group='json'), video_id, fatal=False)
         if player:

yt_dlp/extractor/npo.py

@@ -467,7 +467,7 @@ def add_format_url(format_url):
 
         return {
             'id': video_id,
-            'title': self._live_title(title) if is_live else title,
+            'title': title,
             'description': metadata.get('info'),
             'thumbnail': metadata.get('images', [{'url': None}])[-1]['url'],
             'upload_date': unified_strdate(metadata.get('gidsdatum')),
@@ -561,7 +561,7 @@ def _real_extract(self, url):
         return {
             'id': video_id,
             'url': stream['url'],
-            'title': self._live_title(title),
+            'title': title,
             'acodec': codec,
             'ext': codec,
             'is_live': True,

yt_dlp/extractor/odnoklassniki.py

@@ -235,7 +235,7 @@ def _extract_desktop(self, url):
 
         assert title
         if provider == 'LIVE_TV_APP':
-            info['title'] = self._live_title(title)
+            info['title'] = title
 
         quality = qualities(('4', '0', '1', '2', '3', '5'))
 

yt_dlp/extractor/oktoberfesttv.py

@@ -25,8 +25,8 @@ def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        title = self._live_title(self._html_search_regex(
-            r'<h1><strong>.*?</strong>(.*?)</h1>', webpage, 'title'))
+        title = self._html_search_regex(
+            r'<h1><strong>.*?</strong>(.*?)</h1>', webpage, 'title')
 
         clip = self._search_regex(
             r"clip:\s*\{\s*url:\s*'([^']+)'", webpage, 'clip')

yt_dlp/extractor/picarto.py

@@ -77,7 +77,7 @@ def _real_extract(self, url):
 
         return {
             'id': channel_id,
-            'title': self._live_title(title.strip()),
+            'title': title.strip(),
             'is_live': True,
             'channel': channel_id,
             'channel_id': metadata.get('id'),