diff --git a/yt_dlp/extractor/zdf.py b/yt_dlp/extractor/zdf.py index a862e25d07..2e005c784e 100644 --- a/yt_dlp/extractor/zdf.py +++ b/yt_dlp/extractor/zdf.py @@ -1,6 +1,7 @@ import re from .common import InfoExtractor +from ..compat import compat_str from ..utils import ( NO_DEFAULT, ExtractorError, @@ -13,6 +14,7 @@ from ..utils import ( parse_codecs, qualities, traverse_obj, + try_call, try_get, unified_timestamp, update_url_query, @@ -28,11 +30,11 @@ class ZDFBaseIE(InfoExtractor): def _call_api(self, url, video_id, item, api_token=None, referrer=None): headers = {} if api_token: - headers['Api-Auth'] = f'Bearer {api_token}' + headers['Api-Auth'] = 'Bearer %s' % api_token if referrer: headers['Referer'] = referrer return self._download_json( - url, video_id, f'Downloading JSON {item}', headers=headers) + url, video_id, 'Downloading JSON %s' % item, headers=headers) @staticmethod def _extract_subtitles(src): @@ -72,7 +74,7 @@ class ZDFBaseIE(InfoExtractor): f.update({ 'url': format_url, 'format_id': join_nonempty('http', meta.get('type'), meta.get('quality')), - 'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, 'tbr', default=None)), + 'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, 'tbr', default=None)) }) new_formats = [f] formats.extend(merge_dicts(f, { @@ -235,7 +237,7 @@ class ZDFIE(ZDFBaseIE): 'timestamp': 1641355200, 'upload_date': '20220105', }, - 'skip': 'No longer available "Diese Seite wurde leider nicht gefunden"', + 'skip': 'No longer available "Diese Seite wurde leider nicht gefunden"' }, { 'url': 'https://www.zdf.de/serien/soko-stuttgart/das-geld-anderer-leute-100.html', 'info_dict': { @@ -269,7 +271,7 @@ class ZDFIE(ZDFBaseIE): t = content['mainVideoContent']['http://zdf.de/rels/target'] ptmd_path = traverse_obj(t, ( (('streams', 'default'), None), - ('http://zdf.de/rels/streams/ptmd', 'http://zdf.de/rels/streams/ptmd-template'), + ('http://zdf.de/rels/streams/ptmd', 'http://zdf.de/rels/streams/ptmd-template') ), get_all=False) if not ptmd_path: raise ExtractorError('Could not extract ptmd_path') @@ -302,7 +304,7 @@ class ZDFIE(ZDFBaseIE): chapters = [{ 'start_time': chap.get('anchorOffset'), 'end_time': next_chap.get('anchorOffset'), - 'title': chap.get('anchorLabel'), + 'title': chap.get('anchorLabel') } for chap, next_chap in zip(chapter_marks, chapter_marks[1:])] return merge_dicts(info, { @@ -312,16 +314,23 @@ class ZDFIE(ZDFBaseIE): 'timestamp': unified_timestamp(content.get('editorialDate')), 'thumbnails': thumbnails, 'chapters': chapters or None, + 'season': 'test' }) def _extract_regular(self, url, player, video_id): - content = self._call_api( - player['content'], video_id, 'content', player['apiToken'], url) - return self._extract_entry(player['content'], player, content, video_id) + player_content_v2 = player['content'] + player_content_v3 = update_url_query(player_content_v2, {'profile': 'player-3'}) + + content = try_call( + lambda: self._call_api(player_content_v3, video_id, 'content', player['apiToken'], url), + lambda: self._call_api(player_content_v2, video_id, 'content', player['apiToken'], url), + ) + + return self._extract_entry(player_content_v2, player, content, video_id) def _extract_mobile(self, video_id): video = self._download_json( - f'https://zdf-cdn.live.cellular.de/mediathekV2/document/{video_id}', + 'https://zdf-cdn.live.cellular.de/mediathekV2/document/%s' % video_id, video_id) formats = [] @@ -340,7 +349,7 @@ class ZDFIE(ZDFBaseIE): if isinstance(teaser_bild, dict): for thumbnail_key, thumbnail in teaser_bild.items(): thumbnail_url = try_get( - thumbnail, lambda x: x['url'], str) + thumbnail, lambda x: x['url'], compat_str) if thumbnail_url: thumbnails.append({ 'url': thumbnail_url, @@ -355,7 +364,7 @@ class ZDFIE(ZDFBaseIE): 'description': document.get('beschreibung'), 'duration': int_or_none(document.get('length')), 'timestamp': unified_timestamp(document.get('date')) or unified_timestamp( - try_get(video, lambda x: x['meta']['editorialDate'], str)), + try_get(video, lambda x: x['meta']['editorialDate'], compat_str)), 'thumbnails': thumbnails, 'subtitles': self._extract_subtitles(document), 'formats': formats, @@ -404,10 +413,10 @@ class ZDFChannelIE(ZDFBaseIE): @classmethod def suitable(cls, url): - return False if ZDFIE.suitable(url) else super().suitable(url) + return False if ZDFIE.suitable(url) else super(ZDFChannelIE, cls).suitable(url) def _og_search_title(self, webpage, fatal=False): - title = super()._og_search_title(webpage, fatal=fatal) + title = super(ZDFChannelIE, self)._og_search_title(webpage, fatal=fatal) return re.split(r'\s+[-|]\s+ZDF(?:mediathek)?$', title or '')[0] or None def _real_extract(self, url): @@ -416,7 +425,7 @@ class ZDFChannelIE(ZDFBaseIE): webpage = self._download_webpage(url, channel_id) matches = re.finditer( - rf''']*?\sdata-plusbar-id\s*=\s*(["'])(?P[\w-]+)\1[^>]*?\sdata-plusbar-url=\1(?P{ZDFIE._VALID_URL})\1''', + r''']*?\sdata-plusbar-id\s*=\s*(["'])(?P[\w-]+)\1[^>]*?\sdata-plusbar-url=\1(?P%s)\1''' % ZDFIE._VALID_URL, webpage) if self._downloader.params.get('noplaylist', False): @@ -427,11 +436,11 @@ class ZDFChannelIE(ZDFBaseIE): if entry: return entry else: - self.to_screen(f'Downloading playlist {channel_id} - add --no-playlist to download just the main video') + self.to_screen('Downloading playlist %s - add --no-playlist to download just the main video' % (channel_id, )) def check_video(m): v_ref = self._search_regex( - r'''(]*?\shref\s*=[^>]+?\sdata-target-id\s*=\s*(["']){}\2[^>]*>)'''.format(m.group('p_id')), + r'''(]*?\shref\s*=[^>]+?\sdata-target-id\s*=\s*(["'])%s\2[^>]*>)''' % (m.group('p_id'), ), webpage, 'check id', default='') v_ref = extract_attributes(v_ref) return v_ref.get('data-target-video-type') != 'novideo'