archive
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[extractor] Standardize `_live_title`

Browse Source
pull/2014/head
pukkandan 3 years ago
parent 46383212b3
commit 39ca3b5c7f
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
67 changed files with 68 additions and 94 deletions
Show Stats Download Patch File Download Diff File

3
yt_dlp/YoutubeDL.py
Unescape Escape View File

@ -2673,6 +2673,9 @@ class YoutubeDL(object):
if self._num_downloads >= int(max_downloads): if self._num_downloads >= int(max_downloads):
raise MaxDownloadsReached() 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 # TODO: backward compatibility, to be removed
info_dict['fulltitle'] = info_dict['title'] info_dict['fulltitle'] = info_dict['title']

2
yt_dlp/extractor/abc.py
Unescape Escape View File

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

2
yt_dlp/extractor/adobeconnect.py
Unescape Escape View File

@ -31,7 +31,7 @@ class AdobeConnectIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'formats': formats, 'formats': formats,
'is_live': is_live, 'is_live': is_live,
} }

2
yt_dlp/extractor/arcpublishing.py
Unescape Escape View File

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

2
yt_dlp/extractor/ard.py
Unescape Escape View File

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

2
yt_dlp/extractor/awaan.py
Unescape Escape View File

@ -41,7 +41,7 @@ class AWAANBaseIE(InfoExtractor):
return { return {
'id': video_id, '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'), 'description': video_data.get('description_en') or video_data.get('description_ar'),
'thumbnail': 'http://admin.mangomolo.com/analytics/%s' % img if img else None, 'thumbnail': 'http://admin.mangomolo.com/analytics/%s' % img if img else None,
'duration': int_or_none(video_data.get('duration')), 'duration': int_or_none(video_data.get('duration')),

2
yt_dlp/extractor/bitwave.py
Unescape Escape View File

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

2
yt_dlp/extractor/bongacams.py
Unescape Escape View File

@ -49,7 +49,7 @@ class BongaCamsIE(InfoExtractor):
return { return {
'id': channel_id, 'id': channel_id,
'title': self._live_title(uploader or uploader_id), 'title': uploader or uploader_id,
'uploader': uploader, 'uploader': uploader,
'uploader_id': uploader_id, 'uploader_id': uploader_id,
'like_count': like_count, 'like_count': like_count,

2
yt_dlp/extractor/brightcove.py
Unescape Escape View File

@ -581,7 +581,7 @@ class BrightcoveNewIE(AdobePassIE):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'description': clean_html(json_data.get('description')), 'description': clean_html(json_data.get('description')),
'thumbnail': json_data.get('thumbnail') or json_data.get('poster'), 'thumbnail': json_data.get('thumbnail') or json_data.get('poster'),
'thumbnials': thumbnails, 'thumbnials': thumbnails,

2
yt_dlp/extractor/cam4.py
Unescape Escape View File

@ -25,7 +25,7 @@ class CAM4IE(InfoExtractor):
return { return {
'id': channel_id, 'id': channel_id,
'title': self._live_title(channel_id), 'title': channel_id,
'is_live': True, 'is_live': True,
'age_limit': 18, 'age_limit': 18,
'formats': formats, 'formats': formats,

2
yt_dlp/extractor/cammodels.py
Unescape Escape View File

@ -91,7 +91,7 @@ class CamModelsIE(InfoExtractor):
return { return {
'id': user_id, 'id': user_id,
'title': self._live_title(user_id), 'title': user_id,
'is_live': True, 'is_live': True,
'formats': formats, 'formats': formats,
'age_limit': 18 'age_limit': 18

2
yt_dlp/extractor/ceskatelevize.py
Unescape Escape View File

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

2
yt_dlp/extractor/chaturbate.py
Unescape Escape View File

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

6
yt_dlp/extractor/common.py
Unescape Escape View File

@ -3456,10 +3456,8 @@ class InfoExtractor(object):
return formats return formats
def _live_title(self, name): def _live_title(self, name):
""" Generate the title for a live video """ self._downloader.deprecation_warning('yt_dlp.InfoExtractor._live_title is deprecated and does not work as expected')
now = datetime.datetime.now() return name
now_str = now.strftime('%Y-%m-%d %H:%M')
return name + ' ' + now_str
def _int(self, v, name, fatal=False, **kwargs): def _int(self, v, name, fatal=False, **kwargs):
res = int_or_none(v, **kwargs) res = int_or_none(v, **kwargs)

2
yt_dlp/extractor/dailymotion.py
Unescape Escape View File

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

2
yt_dlp/extractor/dlive.py
Unescape Escape View File

@ -84,7 +84,7 @@ class DLiveStreamIE(InfoExtractor):
self._sort_formats(formats) self._sort_formats(formats)
return { return {
'id': display_name, 'id': display_name,
'title': self._live_title(title), 'title': title,
'uploader': display_name, 'uploader': display_name,
'uploader_id': username, 'uploader_id': username,
'formats': formats, 'formats': formats,

2
yt_dlp/extractor/douyutv.py
Unescape Escape View File

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

2
yt_dlp/extractor/drtv.py
Unescape Escape View File

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

2
yt_dlp/extractor/filmon.py
Unescape Escape View File

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

2
yt_dlp/extractor/francetv.py
Unescape Escape View File

@ -203,7 +203,7 @@ class FranceTVIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'thumbnail': image, 'thumbnail': image,
'duration': duration, 'duration': duration,
'timestamp': timestamp, 'timestamp': timestamp,

3
yt_dlp/extractor/freshlive.py
Unescape Escape View File

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

2
yt_dlp/extractor/hitbox.py
Unescape Escape View File

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

2
yt_dlp/extractor/imggaming.py
Unescape Escape View File

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

2
yt_dlp/extractor/ivideon.py
Unescape Escape View File

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

4
yt_dlp/extractor/laola1tv.py
Unescape Escape View File

@ -112,7 +112,7 @@ class Laola1TvEmbedIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'upload_date': unified_strdate(_v('time_date')), 'upload_date': unified_strdate(_v('time_date')),
'uploader': _v('meta_organisation'), 'uploader': _v('meta_organisation'),
'categories': categories, 'categories': categories,
@ -161,7 +161,7 @@ class Laola1TvBaseIE(Laola1TvEmbedIE):
return { return {
'id': video_id, 'id': video_id,
'display_id': display_id, 'display_id': display_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'description': video_data.get('description'), 'description': video_data.get('description'),
'thumbnail': video_data.get('image'), 'thumbnail': video_data.get('image'),
'categories': categories, 'categories': categories,

2
yt_dlp/extractor/line.py
Unescape Escape View File

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

4
yt_dlp/extractor/livestream.py
Unescape Escape View File

@ -176,7 +176,7 @@ class LivestreamIE(InfoExtractor):
return { return {
'id': broadcast_id, 'id': broadcast_id,
'formats': formats, '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'), 'thumbnail': stream_info.get('thumbnail_url'),
'is_live': is_live, 'is_live': is_live,
} }
@ -344,7 +344,7 @@ class LivestreamOriginalIE(InfoExtractor):
is_live = video_data.get('isLive') is_live = video_data.get('isLive')
info.update({ info.update({
'id': content_id, '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), 'formats': self._extract_video_formats(video_data, content_id),
'is_live': is_live, 'is_live': is_live,
}) })

2
yt_dlp/extractor/mangomolo.py
Unescape Escape View File

@ -33,7 +33,7 @@ class MangomoloBaseIE(InfoExtractor):
return { return {
'id': page_id, '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'), 'uploader_id': hidden_inputs.get('userid'),
'duration': int_or_none(hidden_inputs.get('duration')), 'duration': int_or_none(hidden_inputs.get('duration')),
'is_live': self._IS_LIVE, 'is_live': self._IS_LIVE,

2
yt_dlp/extractor/matchtv.py
Unescape Escape View File

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

2
yt_dlp/extractor/muenchentv.py
Unescape Escape View File

@ -33,7 +33,7 @@ class MuenchenTVIE(InfoExtractor):
display_id = 'live' display_id = 'live'
webpage = self._download_webpage(url, display_id) 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( data_js = self._search_regex(
r'(?s)\nplaylist:\s*(\[.*?}\]),', r'(?s)\nplaylist:\s*(\[.*?}\]),',

4
yt_dlp/extractor/nbc.py
Unescape Escape View File

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

2
yt_dlp/extractor/ndr.py
Unescape Escape View File

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

2
yt_dlp/extractor/nfl.py
Unescape Escape View File

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

4
yt_dlp/extractor/npo.py
Unescape Escape View File

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

2
yt_dlp/extractor/odnoklassniki.py
Unescape Escape View File

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

4
yt_dlp/extractor/oktoberfesttv.py
Unescape Escape View File

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

2
yt_dlp/extractor/picarto.py
Unescape Escape View File

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

2
yt_dlp/extractor/playtvak.py
Unescape Escape View File

@ -167,8 +167,6 @@ class PlaytvakIE(InfoExtractor):
title = item['title'] title = item['title']
is_live = item['type'] == 'stream' is_live = item['type'] == 'stream'
if is_live:
title = self._live_title(title)
description = self._og_search_description(webpage, default=None) or self._html_search_meta( description = self._og_search_description(webpage, default=None) or self._html_search_meta(
'description', webpage, 'description', default=None) 'description', webpage, 'description', default=None)
timestamp = None timestamp = None

2
yt_dlp/extractor/radiode.py
Unescape Escape View File

@ -29,7 +29,7 @@ class RadioDeIE(InfoExtractor):
webpage, 'broadcast') webpage, 'broadcast')
broadcast = self._parse_json(jscode, radio_id) broadcast = self._parse_json(jscode, radio_id)
title = self._live_title(broadcast['name']) title = broadcast['name']
description = broadcast.get('description') or broadcast.get('shortDescription') description = broadcast.get('description') or broadcast.get('shortDescription')
thumbnail = broadcast.get('picture4Url') or broadcast.get('picture4TransUrl') or broadcast.get('logo100x100') thumbnail = broadcast.get('picture4Url') or broadcast.get('picture4TransUrl') or broadcast.get('logo100x100')

3
yt_dlp/extractor/rai.py
Unescape Escape View File

@ -318,8 +318,7 @@ class RaiPlayIE(RaiBaseIE):
info = { info = {
'id': remove_start(media.get('id'), 'ContentItem-') or video_id, 'id': remove_start(media.get('id'), 'ContentItem-') or video_id,
'display_id': video_id, 'display_id': video_id,
'title': self._live_title(title) if relinker_info.get( 'title': title,
'is_live') else title,
'alt_title': strip_or_none(alt_title), 'alt_title': strip_or_none(alt_title),
'description': media.get('description'), 'description': media.get('description'),
'uploader': strip_or_none(media.get('channel')), 'uploader': strip_or_none(media.get('channel')),

2
yt_dlp/extractor/rtbf.py
Unescape Escape View File

@ -85,8 +85,6 @@ class RTBFIE(InfoExtractor):
title = data['title'] title = data['title']
is_live = data.get('isLive') is_live = data.get('isLive')
if is_live:
title = self._live_title(title)
height_re = r'-(\d+)p\.' height_re = r'-(\d+)p\.'
formats = [] formats = []

4
yt_dlp/extractor/rtve.py
Unescape Escape View File

@ -160,7 +160,7 @@ class RTVEALaCartaIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnail': info.get('image'), 'thumbnail': info.get('image'),
'subtitles': subtitles, 'subtitles': subtitles,
@ -230,7 +230,7 @@ class RTVELiveIE(RTVEALaCartaIE):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title), 'title': title,
'formats': self._extract_png_formats(vidplayer_id), 'formats': self._extract_png_formats(vidplayer_id),
'is_live': True, 'is_live': True,
} }

2
yt_dlp/extractor/rutv.py
Unescape Escape View File

@ -201,7 +201,7 @@ class RUTVIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'description': description, 'description': description,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'view_count': view_count, 'view_count': view_count,

2
yt_dlp/extractor/showroomlive.py
Unescape Escape View File

@ -73,7 +73,7 @@ class ShowRoomLiveIE(InfoExtractor):
return { return {
'id': compat_str(room.get('live_id') or broadcaster_id), 'id': compat_str(room.get('live_id') or broadcaster_id),
'title': self._live_title(title), 'title': title,
'description': room.get('description'), 'description': room.get('description'),
'timestamp': int_or_none(room.get('current_live_started_at')), 'timestamp': int_or_none(room.get('current_live_started_at')),
'uploader': uploader, 'uploader': uploader,

2
yt_dlp/extractor/skyit.py
Unescape Escape View File

@ -55,7 +55,7 @@ class SkyItPlayerIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnail': dict_get(video, ('video_still', 'video_still_medium', 'thumb')), 'thumbnail': dict_get(video, ('video_still', 'video_still_medium', 'thumb')),
'description': video.get('short_desc') or None, 'description': video.get('short_desc') or None,

2
yt_dlp/extractor/skylinewebcams.py
Unescape Escape View File

@ -36,7 +36,7 @@ class SkylineWebcamsIE(InfoExtractor):
'id': video_id, 'id': video_id,
'url': stream_url, 'url': stream_url,
'ext': 'mp4', 'ext': 'mp4',
'title': self._live_title(title), 'title': title,
'description': description, 'description': description,
'is_live': True, 'is_live': True,
} }

2
yt_dlp/extractor/stripchat.py
Unescape Escape View File

@ -57,7 +57,7 @@ class StripchatIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(video_id), 'title': video_id,
'description': self._og_search_description(webpage), 'description': self._og_search_description(webpage),
'is_live': True, 'is_live': True,
'formats': formats, 'formats': formats,

6
yt_dlp/extractor/svt.py
Unescape Escape View File

@ -203,10 +203,6 @@ class SVTPlayIE(SVTPlayBaseIE):
'only_matching': True, 'only_matching': True,
}] }]
def _adjust_title(self, info):
if info['is_live']:
info['title'] = self._live_title(info['title'])
def _extract_by_video_id(self, video_id, webpage=None): def _extract_by_video_id(self, video_id, webpage=None):
data = self._download_json( data = self._download_json(
'https://api.svt.se/videoplayer-api/video/%s' % video_id, 'https://api.svt.se/videoplayer-api/video/%s' % video_id,
@ -220,7 +216,6 @@ class SVTPlayIE(SVTPlayBaseIE):
if not title: if not title:
title = video_id title = video_id
info_dict['title'] = title info_dict['title'] = title
self._adjust_title(info_dict)
return info_dict return info_dict
def _real_extract(self, url): def _real_extract(self, url):
@ -251,7 +246,6 @@ class SVTPlayIE(SVTPlayBaseIE):
'title': data['context']['dispatcher']['stores']['MetaStore']['title'], 'title': data['context']['dispatcher']['stores']['MetaStore']['title'],
'thumbnail': thumbnail, 'thumbnail': thumbnail,
}) })
self._adjust_title(info_dict)
return info_dict return info_dict
svt_id = try_get( svt_id = try_get(

2
yt_dlp/extractor/telebruxelles.py
Unescape Escape View File

@ -69,7 +69,7 @@ class TeleBruxellesIE(InfoExtractor):
return { return {
'id': article_id or display_id, 'id': article_id or display_id,
'display_id': display_id, 'display_id': display_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'description': description, 'description': description,
'formats': formats, 'formats': formats,
'is_live': is_live, 'is_live': is_live,

2
yt_dlp/extractor/threeqsdn.py
Unescape Escape View File

@ -148,7 +148,7 @@ class ThreeQSDNIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if live else title, 'title': title,
'thumbnail': config.get('poster') or None, 'thumbnail': config.get('poster') or None,
'description': config.get('description') or None, 'description': config.get('description') or None,
'timestamp': parse_iso8601(config.get('upload_date')), 'timestamp': parse_iso8601(config.get('upload_date')),

2
yt_dlp/extractor/trovo.py
Unescape Escape View File

@ -62,7 +62,7 @@ class TrovoIE(TrovoBaseIE):
raise ExtractorError('%s is offline' % username, expected=True) raise ExtractorError('%s is offline' % username, expected=True)
program_info = live_info['programInfo'] program_info = live_info['programInfo']
program_id = program_info['id'] program_id = program_info['id']
title = self._live_title(program_info['title']) title = program_info['title']
formats = [] formats = []
for stream_info in (program_info.get('streamInfo') or []): for stream_info in (program_info.get('streamInfo') or []):

2
yt_dlp/extractor/tunein.py
Unescape Escape View File

@ -62,7 +62,7 @@ class TuneInBaseIE(InfoExtractor):
return { return {
'id': content_id, 'id': content_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'location': location, 'location': location,

2
yt_dlp/extractor/turner.py
Unescape Escape View File

@ -205,7 +205,7 @@ class TurnerBaseIE(AdobePassIE):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,
'thumbnails': thumbnails, 'thumbnails': thumbnails,

4
yt_dlp/extractor/tv2.py
Unescape Escape View File

@ -106,7 +106,7 @@ class TV2IE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,
'title': self._live_title(title) if is_live else title, 'title': title,
'description': strip_or_none(asset.get('description')), 'description': strip_or_none(asset.get('description')),
'thumbnails': thumbnails, 'thumbnails': thumbnails,
'timestamp': parse_iso8601(asset.get('live_broadcast_time') or asset.get('update_time')), 'timestamp': parse_iso8601(asset.get('live_broadcast_time') or asset.get('update_time')),
@ -271,7 +271,7 @@ class KatsomoIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,
'title': self._live_title(title) if is_live else title, 'title': title,
'description': strip_or_none(asset.get('description')), 'description': strip_or_none(asset.get('description')),
'thumbnails': thumbnails, 'thumbnails': thumbnails,
'timestamp': parse_iso8601(asset.get('createTime')), 'timestamp': parse_iso8601(asset.get('createTime')),

3
yt_dlp/extractor/tvnet.py
Unescape Escape View File

@ -130,9 +130,6 @@ class TVNetIE(InfoExtractor):
r'data-image=(["\'])(?P<url>(?:https?:)?//.+?)\1', webpage, r'data-image=(["\'])(?P<url>(?:https?:)?//.+?)\1', webpage,
'thumbnail', default=None, group='url')) 'thumbnail', default=None, group='url'))
if is_live:
title = self._live_title(title)
view_count = int_or_none(self._search_regex( view_count = int_or_none(self._search_regex(
r'(?s)<div[^>]+\bclass=["\'].*?view-count[^>]+>.*?(\d+).*?</div>', r'(?s)<div[^>]+\bclass=["\'].*?view-count[^>]+>.*?(\d+).*?</div>',
webpage, 'view count', default=None)) webpage, 'view count', default=None))

2
yt_dlp/extractor/tvplayer.py
Unescape Escape View File

@ -80,7 +80,7 @@ class TVPlayerIE(InfoExtractor):
return { return {
'id': resource_id, 'id': resource_id,
'display_id': display_id, 'display_id': display_id,
'title': self._live_title(title), 'title': title,
'formats': formats, 'formats': formats,
'is_live': True, 'is_live': True,
} }

2
yt_dlp/extractor/twitch.py
Unescape Escape View File

@ -903,7 +903,7 @@ class TwitchStreamIE(TwitchBaseIE):
return { return {
'id': stream_id, 'id': stream_id,
'display_id': channel_name, 'display_id': channel_name,
'title': self._live_title(title), 'title': title,
'description': description, 'description': description,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'uploader': uploader, 'uploader': uploader,

2
yt_dlp/extractor/vgtv.py
Unescape Escape View File

@ -242,7 +242,7 @@ class VGTVIE(XstreamIE):
info.update({ info.update({
'id': video_id, 'id': video_id,
'title': self._live_title(data['title']) if is_live else data['title'], 'title': data['title'],
'description': data['description'], 'description': data['description'],
'thumbnail': data['images']['main'] + '?t[]=900x506q80', 'thumbnail': data['images']['main'] + '?t[]=900x506q80',
'timestamp': data['published'], 'timestamp': data['published'],

2
yt_dlp/extractor/vimeo.py
Unescape Escape View File

@ -224,7 +224,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
return { return {
'id': str_or_none(video_data.get('id')) or video_id, 'id': str_or_none(video_data.get('id')) or video_id,
'title': self._live_title(video_title) if is_live else video_title, 'title': video_title,
'uploader': owner.get('name'), 'uploader': owner.get('name'),
'uploader_id': video_uploader_url.split('/')[-1] if video_uploader_url else None, 'uploader_id': video_uploader_url.split('/')[-1] if video_uploader_url else None,
'uploader_url': video_uploader_url, 'uploader_url': video_uploader_url,

2
yt_dlp/extractor/vk.py
Unescape Escape View File

@ -434,8 +434,6 @@ class VKIE(VKBaseIE):
# 2 = live # 2 = live
# 3 = post live (finished live) # 3 = post live (finished live)
is_live = data.get('live') == 2 is_live = data.get('live') == 2
if is_live:
title = self._live_title(title)
timestamp = unified_timestamp(self._html_search_regex( timestamp = unified_timestamp(self._html_search_regex(
r'class=["\']mv_info_date[^>]+>([^<]+)(?:<|from)', info_page, r'class=["\']mv_info_date[^>]+>([^<]+)(?:<|from)', info_page,

2
yt_dlp/extractor/vlive.py
Unescape Escape View File

@ -210,7 +210,7 @@ class VLiveIE(VLiveBaseIE):
self._sort_formats(formats) self._sort_formats(formats)
info = get_common_fields() info = get_common_fields()
info.update({ info.update({
'title': self._live_title(video['title']), 'title': video['title'],
'id': video_id, 'id': video_id,
'formats': formats, 'formats': formats,
'is_live': True, 'is_live': True,

4
yt_dlp/extractor/vyborymos.py
Unescape Escape View File

@ -44,11 +44,11 @@ class VyboryMosIE(InfoExtractor):
info = self._download_json( info = self._download_json(
'http://vybory.mos.ru/json/voting_stations/%s/%s.json' 'http://vybory.mos.ru/json/voting_stations/%s/%s.json'
% (compat_str(station_id)[:3], station_id), % (compat_str(station_id)[:3], station_id),
station_id, 'Downloading station JSON', fatal=False) station_id, 'Downloading station JSON', fatal=False) or {}
return { return {
'id': station_id, 'id': station_id,
'title': self._live_title(info['name'] if info else station_id), 'title': info.get('name') or station_id,
'description': info.get('address'), 'description': info.get('address'),
'is_live': True, 'is_live': True,
'formats': formats, 'formats': formats,

2
yt_dlp/extractor/wdr.py
Unescape Escape View File

@ -117,7 +117,7 @@ class WDRIE(InfoExtractor):
return { return {
'id': tracker_data.get('trackerClipId', video_id), 'id': tracker_data.get('trackerClipId', video_id),
'title': self._live_title(title) if is_live else title, 'title': title,
'alt_title': tracker_data.get('trackerClipSubcategory'), 'alt_title': tracker_data.get('trackerClipSubcategory'),
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,

2
yt_dlp/extractor/yahoo.py
Unescape Escape View File

@ -264,7 +264,7 @@ class YahooIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._live_title(title) if is_live else title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnails': thumbnails, 'thumbnails': thumbnails,
'description': clean_html(video.get('description')), 'description': clean_html(video.get('description')),

2
yt_dlp/extractor/younow.py
Unescape Escape View File

@ -58,7 +58,7 @@ class YouNowLiveIE(InfoExtractor):
return { return {
'id': uploader, 'id': uploader,
'is_live': True, 'is_live': True,
'title': self._live_title(uploader), 'title': uploader,
'thumbnail': data.get('awsUrl'), 'thumbnail': data.get('awsUrl'),
'tags': data.get('tags'), 'tags': data.get('tags'),
'categories': data.get('tags'), 'categories': data.get('tags'),

2
yt_dlp/extractor/youtube.py
Unescape Escape View File

@ -2810,7 +2810,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
info = { info = {
'id': video_id, 'id': video_id,
'title': self._live_title(video_title) if is_live else video_title, 'title': video_title,
'formats': formats, 'formats': formats,
'thumbnails': thumbnails, 'thumbnails': thumbnails,
# The best thumbnail that we are sure exists. Prevents unnecessary # The best thumbnail that we are sure exists. Prevents unnecessary

2
yt_dlp/extractor/zattoo.py
Unescape Escape View File

@ -187,7 +187,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
cid = self._extract_cid(video_id, channel_name) cid = self._extract_cid(video_id, channel_name)
info_dict = { info_dict = {
'id': channel_name, 'id': channel_name,
'title': self._live_title(channel_name), 'title': channel_name,
'is_live': True, 'is_live': True,
} }
else: else:

Write Preview
Loading…
Cancel
Save