From 137f07c27a88b07df57df5b2cdebebe3c7722bac Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 5 Aug 2024 11:06:10 +0200 Subject: Merging upstream version 2024.07.01. Signed-off-by: Daniel Baumann --- yt_dlp/extractor/tvp.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'yt_dlp/extractor/tvp.py') diff --git a/yt_dlp/extractor/tvp.py b/yt_dlp/extractor/tvp.py index f1ebf02..da30829 100644 --- a/yt_dlp/extractor/tvp.py +++ b/yt_dlp/extractor/tvp.py @@ -98,7 +98,7 @@ class TVPIE(InfoExtractor): 'playlist_mincount': 1800, 'params': { 'skip_download': True, - } + }, }, { # ABC-specific video embeding # moved to https://bajkowakraina.tvp.pl/wideo/50981130,teleranek,51027049,zubr,51116450 @@ -221,7 +221,7 @@ class TVPIE(InfoExtractor): if website_data.get('items_total_count') > website_data.get('items_per_page'): for page in itertools.count(2): page_website_data = self._parse_vue_website_data( - self._download_webpage(url, page_id, note='Downloading page #%d' % page, + self._download_webpage(url, page_id, note=f'Downloading page #{page}', query={'page': page}), page_id) if not page_website_data.get('videos') and not page_website_data.get('items'): @@ -290,7 +290,7 @@ class TVPStreamIE(InfoExtractor): def _real_extract(self, url): channel_id = self._match_id(url) - channel_url = self._proto_relative_url('//stream.tvp.pl/?channel_id=%s' % channel_id or 'default') + channel_url = self._proto_relative_url(f'//stream.tvp.pl/?channel_id={channel_id}' or 'default') webpage = self._download_webpage(channel_url, channel_id or 'default', 'Downloading channel webpage') channels = self._search_json( r'window\.__channels\s*=', webpage, 'channel list', channel_id, @@ -300,7 +300,7 @@ class TVPStreamIE(InfoExtractor): return { '_type': 'url_transparent', 'id': channel_id or channel['id'], - 'url': 'tvp:%s' % audition['video_id'], + 'url': 'tvp:{}'.format(audition['video_id']), 'title': audition.get('title'), 'alt_title': channel.get('title'), 'is_live': True, @@ -379,8 +379,7 @@ class TVPEmbedIE(InfoExtractor): )) webpage = self._download_webpage( - ('https://www.tvp.pl/sess/TVPlayer2/api.php?id=%s' - + '&@method=getTvpConfig&@callback=%s') % (video_id, callback), video_id) + f'https://www.tvp.pl/sess/TVPlayer2/api.php?id={video_id}&@method=getTvpConfig&@callback={callback}', video_id) # stripping JSONP padding datastr = webpage[15 + len(callback):-3] @@ -470,7 +469,7 @@ class TVPEmbedIE(InfoExtractor): # vod.tvp.pl if info.get('vortalName') == 'vod': info_dict.update({ - 'title': '%s, %s' % (info.get('title'), info.get('subtitle')), + 'title': '{}, {}'.format(info.get('title'), info.get('subtitle')), 'series': info.get('title'), 'season': info.get('season'), 'episode_number': info.get('episode'), -- cgit v1.2.3