[ie/zdf] Fix language extraction and format sorting (#13313)

Closes #13118
Authored by: InvalidUsernameException

yt_dlp/extractor/bilibili.py

@@ -816,6 +816,26 @@ class BiliBiliBangumiIE(BilibiliBaseIE):
             'upload_date': '20111104',
             'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
         },
+    }, {
+        'note': 'new playurlSSRData scheme',
+        'url': 'https://www.bilibili.com/bangumi/play/ep678060',
+        'info_dict': {
+            'id': '678060',
+            'ext': 'mp4',
+            'series': '去你家吃饭好吗',
+            'series_id': '6198',
+            'season': '第二季',
+            'season_id': '42542',
+            'season_number': 2,
+            'episode': '吴老二：你家大公鸡养不熟，能煮熟吗…',
+            'episode_id': '678060',
+            'episode_number': 61,
+            'title': '一只小九九丫 吴老二：你家大公鸡养不熟，能煮熟吗…',
+            'duration': 266.123,
+            'timestamp': 1663315904,
+            'upload_date': '20220916',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+        },
     }, {
         'url': 'https://www.bilibili.com/bangumi/play/ep267851',
         'info_dict': {
@@ -879,12 +899,26 @@ class BiliBiliBangumiIE(BilibiliBaseIE):
                 'Extracting episode', query={'fnval': 12240, 'ep_id': episode_id},
                 headers=headers))
 
+        geo_blocked = traverse_obj(play_info, (
+            'raw', 'data', 'plugins', lambda _, v: v['name'] == 'AreaLimitPanel', 'config', 'is_block', {bool}, any))
         premium_only = play_info.get('code') == -10403
-        play_info = traverse_obj(play_info, ('result', 'video_info', {dict})) or {}
 
-        formats = self.extract_formats(play_info)
+        video_info = traverse_obj(play_info, (('result', ('raw', 'data')), 'video_info', {dict}, any)) or {}
-        if not formats and (premium_only or '成为大会员抢先看' in webpage or '开通大会员观看' in webpage):
+        formats = self.extract_formats(video_info)
-            self.raise_login_required('This video is for premium members only')
+
+        if not formats:
+            if geo_blocked:
+                self.raise_geo_restricted()
+            elif premium_only or '成为大会员抢先看' in webpage or '开通大会员观看' in webpage:
+                self.raise_login_required('This video is for premium members only')
+
+        if traverse_obj(play_info, ((
+            ('result', 'play_check', 'play_detail'),  # 'PLAY_PREVIEW' vs 'PLAY_WHOLE'
+            ('raw', 'data', 'play_video_type'),  # 'preview' vs 'whole'
+        ), any, {lambda x: x in ('PLAY_PREVIEW', 'preview')})):
+            self.report_warning(
+                'Only preview format is available, '
+                f'you have to become a premium member to access full video. {self._login_hint()}')
 
         bangumi_info = self._download_json(
             'https://api.bilibili.com/pgc/view/web/season', episode_id, 'Get episode details',
@@ -922,7 +956,7 @@ class BiliBiliBangumiIE(BilibiliBaseIE):
             'season': str_or_none(season_title),
             'season_id': str_or_none(season_id),
             'season_number': season_number,
-            'duration': float_or_none(play_info.get('timelength'), scale=1000),
+            'duration': float_or_none(video_info.get('timelength'), scale=1000),
             'subtitles': self.extract_subtitles(episode_id, episode_info.get('cid'), aid=aid),
             '__post_extractor': self.extract_comments(aid),
             'http_headers': {'Referer': url},

yt_dlp/extractor/dreisat.py

@@ -64,7 +64,7 @@ class DreiSatIE(ZDFBaseIE):
             'title': 'dein buch  - Das Beste von der Leipziger Buchmesse 2025 - Teil 1',
             'description': 'md5:bae51bfc22f15563ce3acbf97d2e8844',
             'duration': 5399.0,
-            'thumbnail': 'https://www.3sat.de/assets/buchmesse-kerkeling-100~original?cb=1743329640903',
+            'thumbnail': 'https://www.3sat.de/assets/buchmesse-kerkeling-100~original?cb=1747256996338',
             'chapters': 'count:24',
             'episode': 'dein buch  - Das Beste von der Leipziger Buchmesse 2025 - Teil 1',
             'episode_id': 'POS_1ef236cc-b390-401e-acd0-4fb4b04315fb',

yt_dlp/extractor/nobelprize.py

@@ -1,59 +1,57 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
+    UnsupportedError,
-    get_element_by_attribute,
+    clean_html,
     int_or_none,
-    js_to_json,
+    parse_duration,
-    mimetype2ext,
+    parse_qs,
-    update_url_query,
+    str_or_none,
+    update_url,
 )
+from ..utils.traversal import find_element, traverse_obj
 
 
 class NobelPrizeIE(InfoExtractor):
-    _WORKING = False
+    _VALID_URL = r'https?://(?:(?:mediaplayer|www)\.)?nobelprize\.org/mediaplayer/'
-    _VALID_URL = r'https?://(?:www\.)?nobelprize\.org/mediaplayer.*?\bid=(?P<id>\d+)'
+    _TESTS = [{
-    _TEST = {
+        'url': 'https://www.nobelprize.org/mediaplayer/?id=2636',
-        'url': 'http://www.nobelprize.org/mediaplayer/?id=2636',
-        'md5': '04c81e5714bb36cc4e2232fee1d8157f',
         'info_dict': {
             'id': '2636',
             'ext': 'mp4',
             'title': 'Announcement of the 2016 Nobel Prize in Physics',
-            'description': 'md5:05beba57f4f5a4bbd4cf2ef28fcff739',
+            'description': 'md5:1a2d8a6ca80c88fb3b9a326e0b0e8e43',
+            'duration': 1560.0,
+            'thumbnail': r're:https?://www\.nobelprize\.org/images/.+\.jpg',
+            'timestamp': 1504883793,
+            'upload_date': '20170908',
         },
-    }
+    }, {
+        'url': 'https://mediaplayer.nobelprize.org/mediaplayer/?qid=12693',
+        'info_dict': {
+            'id': '12693',
+            'ext': 'mp4',
+            'title': 'Nobel Lecture by Peter Higgs',
+            'description': 'md5:9b12e275dbe3a8138484e70e00673a05',
+            'duration': 1800.0,
+            'thumbnail': r're:https?://www\.nobelprize\.org/images/.+\.jpg',
+            'timestamp': 1504883793,
+            'upload_date': '20170908',
+        },
+    }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        video_id = traverse_obj(parse_qs(url), (
-        webpage = self._download_webpage(url, video_id)
+            ('id', 'qid'), -1, {int_or_none}, {str_or_none}, any))
-        media = self._parse_json(self._search_regex(
+        if not video_id:
-            r'(?s)var\s*config\s*=\s*({.+?});', webpage,
+            raise UnsupportedError(url)
-            'config'), video_id, js_to_json)['media']
+        webpage = self._download_webpage(
-        title = media['title']
+            update_url(url, netloc='mediaplayer.nobelprize.org'), video_id)
-
-        formats = []
-        for source in media.get('source', []):
-            source_src = source.get('src')
-            if not source_src:
-                continue
-            ext = mimetype2ext(source.get('type')) or determine_ext(source_src)
-            if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    source_src, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            elif ext == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    update_url_query(source_src, {'hdcore': '3.7.0'}),
-                    video_id, f4m_id='hds', fatal=False))
-            else:
-                formats.append({
-                    'url': source_src,
-                })
 
         return {
+            **self._search_json_ld(webpage, video_id),
             'id': video_id,
-            'title': title,
+            'title': self._html_search_meta('caption', webpage),
-            'description': get_element_by_attribute('itemprop', 'description', webpage),
+            'description': traverse_obj(webpage, (
-            'duration': int_or_none(media.get('duration')),
+                {find_element(tag='span', attr='itemprop', value='description')}, {clean_html})),
-            'formats': formats,
+            'duration': parse_duration(self._html_search_meta('duration', webpage)),
         }

yt_dlp/extractor/srmediathek.py

@@ -1,57 +1,102 @@
 from .ard import ARDMediathekBaseIE
 from ..utils import (
     ExtractorError,
-    get_element_by_attribute,
+    clean_html,
+    extract_attributes,
+    parse_duration,
+    parse_qs,
+    unified_strdate,
+)
+from ..utils.traversal import (
+    find_element,
+    require,
+    traverse_obj,
 )
 
 
 class SRMediathekIE(ARDMediathekBaseIE):
-    _WORKING = False
     IE_NAME = 'sr:mediathek'
     IE_DESC = 'Saarländischer Rundfunk'
-    _VALID_URL = r'https?://sr-mediathek(?:\.sr-online)?\.de/index\.php\?.*?&id=(?P<id>[0-9]+)'
 
+    _CLS_COMMON = 'teaser__image__caption__text teaser__image__caption__text--'
+    _VALID_URL = r'https?://(?:www\.)?sr-mediathek\.de/index\.php\?.*?&id=(?P<id>\d+)'
     _TESTS = [{
-        'url': 'http://sr-mediathek.sr-online.de/index.php?seite=7&id=28455',
+        'url': 'https://www.sr-mediathek.de/index.php?seite=7&id=141317',
         'info_dict': {
-            'id': '28455',
+            'id': '141317',
             'ext': 'mp4',
-            'title': 'sportarena (26.10.2014)',
+            'title': 'Kärnten, da will ich hin!',
-            'description': 'Ringen: KSV Köllerbach gegen Aachen-Walheim; Frauen-Fußball: 1. FC Saarbrücken gegen Sindelfingen; Motorsport: Rallye in Losheim; dazu: Interview mit Timo Bernhard; Turnen: TG Saar; Reitsport: Deutscher Voltigier-Pokal; Badminton: Interview mit Michael Fuchs ',
+            'channel': 'SR Fernsehen',
-            'thumbnail': r're:^https?://.*\.jpg$',
+            'description': 'md5:7732e71e803379a499732864a572a456',
-        },
+            'duration': 1788.0,
-        'skip': 'no longer available',
+            'release_date': '20250525',
-    }, {
+            'series': 'da will ich hin!',
-        'url': 'http://sr-mediathek.sr-online.de/index.php?seite=7&id=37682',
+            'series_id': 'DWIH',
-        'info_dict': {
+            'thumbnail': r're:https?://.+\.jpg',
-            'id': '37682',
-            'ext': 'mp4',
-            'title': 'Love, Cakes and Rock\'n\'Roll',
-            'description': 'md5:18bf9763631c7d326c22603681e1123d',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
         },
     }, {
-        'url': 'http://sr-mediathek.de/index.php?seite=7&id=7480',
+        'url': 'https://www.sr-mediathek.de/index.php?seite=7&id=153853',
-        'only_matching': True,
+        'info_dict': {
+            'id': '153853',
+            'ext': 'mp3',
+            'title': 'Kappes, Klöße, Kokosmilch: Bruschetta mit Nduja',
+            'channel': 'SR 3',
+            'description': 'md5:3935798de3562b10c4070b408a15e225',
+            'duration': 139.0,
+            'release_date': '20250523',
+            'series': 'Kappes, Klöße, Kokosmilch',
+            'series_id': 'SR3_KKK_A',
+            'thumbnail': r're:https?://.+\.jpg',
+        },
+    }, {
+        'url': 'https://www.sr-mediathek.de/index.php?seite=7&id=31406&pnr=&tbl=pf',
+        'info_dict': {
+            'id': '31406',
+            'ext': 'mp3',
+            'title': 'Das Leben schwer nehmen, ist einfach zu anstrengend',
+            'channel': 'SR 1',
+            'description': 'md5:3e03fd556af831ad984d0add7175fb0c',
+            'duration': 1769.0,
+            'release_date': '20230717',
+            'series': 'Abendrot',
+            'series_id': 'SR1_AB_P',
+            'thumbnail': r're:https?://.+\.jpg',
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
+        description = self._og_search_description(webpage)
 
-        if '>Der gew&uuml;nschte Beitrag ist leider nicht mehr verf&uuml;gbar.<' in webpage:
+        if description == 'Der gewünschte Beitrag ist leider nicht mehr vorhanden.':
             raise ExtractorError(f'Video {video_id} is no longer available', expected=True)
 
-        media_collection_url = self._search_regex(
+        player_url = traverse_obj(webpage, (
-            r'data-mediacollection-ardplayer="([^"]+)"', webpage, 'media collection url')
+            {find_element(tag='div', id=f'player{video_id}', html=True)},
-        info = self._extract_media_info(media_collection_url, webpage, video_id)
+            {extract_attributes}, 'data-mediacollection-ardplayer',
-        info.update({
+            {self._proto_relative_url}, {require('player URL')}))
+        article = traverse_obj(webpage, (
+            {find_element(cls='article__content')},
+            {find_element(tag='p')}, {clean_html}))
+
+        return {
+            **self._extract_media_info(player_url, webpage, video_id),
             'id': video_id,
-            'title': get_element_by_attribute('class', 'ardplayer-title', webpage),
+            'title': traverse_obj(webpage, (
-            'description': self._og_search_description(webpage),
+                {find_element(cls='ardplayer-title')}, {clean_html})),
+            'channel': traverse_obj(webpage, (
+                {find_element(cls=f'{self._CLS_COMMON}subheadline')},
+                {lambda x: x.split('|')[0]}, {clean_html})),
+            'description': description,
+            'duration': parse_duration(self._search_regex(
+                r'(\d{2}:\d{2}:\d{2})', article, 'duration')),
+            'release_date': unified_strdate(self._search_regex(
+                r'(\d{2}\.\d{2}\.\d{4})', article, 'release_date')),
+            'series': traverse_obj(webpage, (
+                {find_element(cls=f'{self._CLS_COMMON}headline')}, {clean_html})),
+            'series_id': traverse_obj(webpage, (
+                {find_element(cls='teaser__link', html=True)},
+                {extract_attributes}, 'href', {parse_qs}, 'sen', ..., {str}, any)),
             'thumbnail': self._og_search_thumbnail(webpage),
-        })
+        }
-        return info

yt_dlp/extractor/startrek.py

@@ -1,76 +1,76 @@
 from .common import InfoExtractor
-from ..utils import int_or_none, urljoin
+from .youtube import YoutubeIE
+from ..utils import (
+    clean_html,
+    parse_iso8601,
+    update_url,
+    url_or_none,
+)
+from ..utils.traversal import subs_list_to_dict, traverse_obj
 
 
 class StarTrekIE(InfoExtractor):
-    _WORKING = False
+    IE_NAME = 'startrek'
-    _VALID_URL = r'(?P<base>https?://(?:intl|www)\.startrek\.com)/videos/(?P<id>[^/]+)'
+    IE_DESC = 'STAR TREK'
+    _VALID_URL = r'https?://(?:www\.)?startrek\.com(?:/en-(?:ca|un))?/videos/(?P<id>[^/?#]+)'
     _TESTS = [{
-        'url': 'https://intl.startrek.com/videos/watch-welcoming-jess-bush-to-the-ready-room',
+        'url': 'https://www.startrek.com/en-un/videos/official-trailer-star-trek-lower-decks-season-4',
-        'md5': '491df5035c9d4dc7f63c79caaf9c839e',
         'info_dict': {
-            'id': 'watch-welcoming-jess-bush-to-the-ready-room',
+            'id': 'official-trailer-star-trek-lower-decks-season-4',
             'ext': 'mp4',
-            'title': 'WATCH: Welcoming Jess Bush to The Ready Room',
+            'title': 'Official Trailer | Star Trek: Lower Decks - Season 4',
-            'duration': 1888,
+            'alt_title': 'md5:dd7e3191aaaf9e95db16fc3abd5ef68b',
-            'timestamp': 1655388000,
+            'categories': ['TRAILERS'],
-            'upload_date': '20220616',
+            'description': 'md5:563d7856ddab99bee7a5e50f45531757',
-            'description': 'md5:1ffee884e3920afbdd6dd04e926a1221',
+            'release_date': '20230722',
-            'thumbnail': r're:https://(?:intl|www)\.startrek\.com/sites/default/files/styles/video_1920x1080/public/images/2022-06/pp_14794_rr_thumb_107_yt_16x9\.jpg(?:\?.+)?',
+            'release_timestamp': 1690033200,
-            'subtitles': {'en-US': [{
+            'series': 'Star Trek: Lower Decks',
-                'url': r're:https://(?:intl|www)\.startrek\.com/sites/default/files/video/captions/2022-06/TRR_SNW_107_v4\.vtt',
+            'series_id': 'star-trek-lower-decks',
-            }, {
+            'thumbnail': r're:https?://.+\.(?:jpg|png)',
-                'url': 'https://media.startrek.com/2022/06/16/2043801155561/1069981_hls/trr_snw_107_v4-c4bfc25d/stream_vtt.m3u8',
-            }]},
         },
     }, {
-        'url': 'https://www.startrek.com/videos/watch-ethan-peck-and-gia-sandhu-beam-down-to-the-ready-room',
+        'url': 'https://www.startrek.com/en-ca/videos/my-first-contact-senator-cory-booker',
-        'md5': 'f5ad74fbb86e91e0882fc0a333178d1d',
         'info_dict': {
-            'id': 'watch-ethan-peck-and-gia-sandhu-beam-down-to-the-ready-room',
+            'id': 'my-first-contact-senator-cory-booker',
             'ext': 'mp4',
-            'title': 'WATCH: Ethan Peck and Gia Sandhu Beam Down to The Ready Room',
+            'title': 'My First Contact: Senator Cory Booker',
-            'duration': 1986,
+            'alt_title': 'md5:fe74a8bdb0afab421c6e159a7680db4d',
-            'timestamp': 1654221600,
+            'categories': ['MY FIRST CONTACT'],
-            'upload_date': '20220603',
+            'description': 'md5:a3992ab3b3e0395925d71156bbc018ce',
-            'description': 'md5:b3aa0edacfe119386567362dec8ed51b',
+            'release_date': '20250401',
-            'thumbnail': r're:https://www\.startrek\.com/sites/default/files/styles/video_1920x1080/public/images/2022-06/pp_14792_rr_thumb_105_yt_16x9_1.jpg(?:\?.+)?',
+            'release_timestamp': 1743512400,
-            'subtitles': {'en-US': [{
+            'series': 'Star Trek: The Original Series',
-                'url': r're:https://(?:intl|www)\.startrek\.com/sites/default/files/video/captions/2022-06/TRR_SNW_105_v5\.vtt',
+            'series_id': 'star-trek-the-original-series',
-            }]},
+            'thumbnail': r're:https?://.+\.(?:jpg|png)',
         },
     }]
 
     def _real_extract(self, url):
-        urlbase, video_id = self._match_valid_url(url).group('base', 'id')
+        video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        player = self._search_regex(
+        page_props = self._search_nextjs_data(webpage, video_id)['props']['pageProps']
-            r'(<\s*div\s+id\s*=\s*"cvp-player-[^<]+<\s*/div\s*>)', webpage, 'player')
+        video_data = page_props['video']['data']
+        if youtube_id := video_data.get('youtube_video_id'):
+            return self.url_result(youtube_id, YoutubeIE)
 
-        hls = self._html_search_regex(r'\bdata-hls\s*=\s*"([^"]+)"', player, 'HLS URL')
+        series_id = traverse_obj(video_data, (
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(hls, video_id, 'mp4')
+            'series_and_movies', ..., 'series_or_movie', 'slug', {str}, any))
-
-        captions = self._html_search_regex(
-            r'\bdata-captions-url\s*=\s*"([^"]+)"', player, 'captions URL', fatal=False)
-        if captions:
-            subtitles.setdefault('en-US', [])[:0] = [{'url': urljoin(urlbase, captions)}]
-
-        # NB: Most of the data in the json_ld is undesirable
-        json_ld = self._search_json_ld(webpage, video_id, fatal=False)
 
         return {
             'id': video_id,
-            'title': self._html_search_regex(
+            'series': traverse_obj(page_props, (
-                r'\bdata-title\s*=\s*"([^"]+)"', player, 'title', json_ld.get('title')),
+                'queried', 'header', 'tab3', 'slices', ..., 'items',
-            'description': self._html_search_regex(
+                lambda _, v: v['link']['slug'] == series_id, 'link_copy', {str}, any)),
-                r'(?s)<\s*div\s+class\s*=\s*"header-body"\s*>(.+?)<\s*/div\s*>',
+            'series_id': series_id,
-                webpage, 'description', fatal=False),
+            **traverse_obj(video_data, {
-            'duration': int_or_none(self._html_search_regex(
+                'title': ('title', ..., 'text', {clean_html}, any),
-                r'\bdata-duration\s*=\s*"(\d+)"', player, 'duration', fatal=False)),
+                'alt_title': ('subhead', ..., 'text', {clean_html}, any),
-            'formats': formats,
+                'categories': ('category', 'data', 'category_name', {str.upper}, filter, all),
-            'subtitles': subtitles,
+                'description': ('slices', ..., 'primary', 'content', ..., 'text', {clean_html}, any),
-            'thumbnail': urljoin(urlbase, self._html_search_regex(
+                'release_timestamp': ('published', {parse_iso8601}),
-                r'\bdata-poster-url\s*=\s*"([^"]+)"', player, 'thumbnail', fatal=False)),
+                'subtitles': ({'url': 'legacy_subtitle_file'}, all, {subs_list_to_dict(lang='en')}),
-            'timestamp': json_ld.get('timestamp'),
+                'thumbnail': ('poster_frame', 'url', {url_or_none}, {update_url(query=None)}),
+                'url': ('legacy_video_url', {url_or_none}),
+            }),
         }

yt_dlp/extractor/zdf.py

@@ -6,6 +6,7 @@ import time
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    ISO639Utils,
     determine_ext,
     filter_dict,
     float_or_none,
@@ -118,10 +119,7 @@ class ZDFBaseIE(InfoExtractor):
                         if ext == 'm3u8':
                             fmts = self._extract_m3u8_formats(
                                 format_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
-                        elif ext == 'mpd':
+                        elif ext in ('mp4', 'webm'):
-                            fmts = self._extract_mpd_formats(
-                                format_url, video_id, mpd_id='dash', fatal=False)
-                        else:
                             height = int_or_none(quality.get('highestVerticalResolution'))
                             width = round(aspect_ratio * height) if aspect_ratio and height else None
                             fmts = [{
@@ -132,16 +130,31 @@ class ZDFBaseIE(InfoExtractor):
                                 'format_id': join_nonempty('http', stream.get('type')),
                                 'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, 'tbr', default=None)),
                             }]
+                        else:
+                            self.report_warning(f'Skipping unsupported extension "{ext}"', video_id=video_id)
+                            fmts = []
+
                         f_class = variant.get('class')
                         for f in fmts:
+                            f_lang = ISO639Utils.short2long(
+                                (f.get('language') or variant.get('language') or '').lower())
+                            is_audio_only = f.get('vcodec') == 'none'
                             formats.append({
                                 **f,
-                                'format_id': join_nonempty(f.get('format_id'), is_dgs and 'dgs'),
+                                'format_id': join_nonempty(f['format_id'], is_dgs and 'dgs'),
                                 'format_note': join_nonempty(
-                                    f_class, is_dgs and 'German Sign Language', f.get('format_note'), delim=', '),
+                                    not is_audio_only and f_class,
-                                'language': variant.get('language') or f.get('language'),
+                                    is_dgs and 'German Sign Language',
+                                    f.get('format_note'), delim=', '),
                                 'preference': -2 if is_dgs else -1,
-                                'language_preference': 10 if f_class == 'main' else -10 if f_class == 'ad' else -1,
+                                'language': f_lang,
+                                'language_preference': (
+                                    -10 if ((is_audio_only and f.get('format_note') == 'Audiodeskription')
+                                            or (not is_audio_only and f_class == 'ad'))
+                                    else 10 if f_lang == 'deu' and f_class == 'main'
+                                    else 5 if f_lang == 'deu'
+                                    else 1 if f_class == 'main'
+                                    else -1),
                             })
 
         return {
@@ -333,12 +346,13 @@ class ZDFIE(ZDFBaseIE):
             'title': 'Dobrindt schließt Steuererhöhungen aus',
             'description': 'md5:9a117646d7b8df6bc902eb543a9c9023',
             'duration': 325,
-            'thumbnail': 'https://www.zdf.de/assets/dobrindt-csu-berlin-direkt-100~1920x1080?cb=1743357653736',
+            'thumbnail': 'https://www.zdfheute.de/assets/dobrindt-csu-berlin-direkt-100~1920x1080?cb=1743357653736',
             'timestamp': 1743374520,
             'upload_date': '20250330',
             '_old_archive_ids': ['zdf 250330_clip_2_bdi'],
         },
     }, {
+        # FUNK video (hosted on a different CDN, has atypical PTMD and HLS files)
         'url': 'https://www.zdf.de/funk/druck-11790/funk-alles-ist-verzaubert-102.html',
         'md5': '57af4423db0455a3975d2dc4578536bc',
         'info_dict': {
@@ -651,6 +665,7 @@ class ZDFChannelIE(ZDFBaseIE):
             'description': 'md5:6edad39189abf8431795d3d6d7f986b3',
         },
         'playlist_count': 242,
+        'skip': 'Video count changes daily, needs support for playlist_maxcount',
     }]
 
     _PAGE_SIZE = 24