Merge e767973d8c into c699bafc50

Closes #11537

Authored by: bashonly

test/test_traversal.py

@@ -481,7 +481,7 @@ class TestTraversalHelpers:
             'id': 'name',
             'data': 'content',
             'url': 'url',
-        }, all, {subs_list_to_dict}]) == {
+        }, all, {subs_list_to_dict(lang=None)}]) == {
             'de': [{'url': 'https://example.com/subs/de.ass'}],
             'en': [{'data': 'content'}],
         }, 'subs with mandatory items missing should be filtered'
@@ -507,6 +507,54 @@ class TestTraversalHelpers:
             {'url': 'https://example.com/subs/en1', 'ext': 'ext'},
             {'url': 'https://example.com/subs/en2', 'ext': 'ext'},
         ]}, '`quality` key should sort subtitle list accordingly'
+        assert traverse_obj([
+            {'name': 'de', 'url': 'https://example.com/subs/de.ass'},
+            {'name': 'de'},
+            {'name': 'en', 'content': 'content'},
+            {'url': 'https://example.com/subs/en'},
+        ], [..., {
+            'id': 'name',
+            'url': 'url',
+            'data': 'content',
+        }, all, {subs_list_to_dict(lang='en')}]) == {
+            'de': [{'url': 'https://example.com/subs/de.ass'}],
+            'en': [
+                {'data': 'content'},
+                {'url': 'https://example.com/subs/en'},
+            ],
+        }, 'optionally provided lang should be used if no id available'
+        assert traverse_obj([
+            {'name': 1, 'url': 'https://example.com/subs/de1'},
+            {'name': {}, 'url': 'https://example.com/subs/de2'},
+            {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},
+            {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},
+        ], [..., {
+            'id': 'name',
+            'url': 'url',
+            'ext': 'ext',
+        }, all, {subs_list_to_dict(lang=None)}]) == {
+            'de': [
+                {'url': 'https://example.com/subs/de3'},
+                {'url': 'https://example.com/subs/de4'},
+            ],
+        }, 'non str types should be ignored for id and ext'
+        assert traverse_obj([
+            {'name': 1, 'url': 'https://example.com/subs/de1'},
+            {'name': {}, 'url': 'https://example.com/subs/de2'},
+            {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},
+            {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},
+        ], [..., {
+            'id': 'name',
+            'url': 'url',
+            'ext': 'ext',
+        }, all, {subs_list_to_dict(lang='de')}]) == {
+            'de': [
+                {'url': 'https://example.com/subs/de1'},
+                {'url': 'https://example.com/subs/de2'},
+                {'url': 'https://example.com/subs/de3'},
+                {'url': 'https://example.com/subs/de4'},
+            ],
+        }, 'non str types should be replaced by default id'
 
     def test_trim_str(self):
         with pytest.raises(TypeError):
@@ -525,7 +573,7 @@ class TestTraversalHelpers:
     def test_unpack(self):
         assert unpack(lambda *x: ''.join(map(str, x)))([1, 2, 3]) == '123'
         assert unpack(join_nonempty)([1, 2, 3]) == '1-2-3'
-        assert unpack(join_nonempty(delim=' '))([1, 2, 3]) == '1 2 3'
+        assert unpack(join_nonempty, delim=' ')([1, 2, 3]) == '1 2 3'
         with pytest.raises(TypeError):
             unpack(join_nonempty)()
         with pytest.raises(TypeError):

test/test_utils.py

@@ -72,7 +72,6 @@ from yt_dlp.utils import (
     intlist_to_bytes,
     iri_to_uri,
     is_html,
-    join_nonempty,
     js_to_json,
     limit_length,
     locked_file,
@@ -2158,10 +2157,6 @@ Line 1
         assert int_or_none(v=10) == 10, 'keyword passed positional should call function'
         assert int_or_none(scale=0.1)(10) == 100, 'call after partial application should call the function'
 
-        assert callable(join_nonempty(delim=', ')), 'varargs positional should apply partially'
-        assert callable(join_nonempty()), 'varargs positional should apply partially'
-        assert join_nonempty(None, delim=', ') == '', 'passed varargs should call the function'
-
 
 if __name__ == '__main__':
     unittest.main()

yt_dlp/YoutubeDL.py

@@ -4381,7 +4381,9 @@ class YoutubeDL:
             return None
 
         for idx, t in list(enumerate(thumbnails))[::-1]:
-            thumb_ext = (f'{t["id"]}.' if multiple else '') + determine_ext(t['url'], 'jpg')
+            thumb_ext = t.get('ext') or determine_ext(t['url'], 'jpg')
+            if multiple:
+                thumb_ext = f'{t["id"]}.{thumb_ext}'
             thumb_display_id = f'{label} thumbnail {t["id"]}'
             thumb_filename = replace_extension(filename, thumb_ext, info_dict.get('ext'))
             thumb_filename_final = replace_extension(thumb_filename_base, thumb_ext, info_dict.get('ext'))

yt_dlp/extractor/_extractors.py

@@ -1085,10 +1085,6 @@ from .manoto import (
 )
 from .manyvids import ManyVidsIE
 from .maoritv import MaoriTVIE
-from .markiza import (
-    MarkizaIE,
-    MarkizaPageIE,
-)
 from .massengeschmacktv import MassengeschmackTVIE
 from .masters import MastersIE
 from .matchtv import MatchTVIE

yt_dlp/extractor/afreecatv.py

@@ -66,6 +66,14 @@ class AfreecaTVBaseIE(InfoExtractor):
             extensions={'legacy_ssl': True}), display_id,
             'Downloading API JSON', 'Unable to download API JSON')
 
+    @staticmethod
+    def _fixup_thumb(thumb_url):
+        if not url_or_none(thumb_url):
+            return None
+        # Core would determine_ext as 'php' from the url, so we need to provide the real ext
+        # See: https://github.com/yt-dlp/yt-dlp/issues/11537
+        return [{'url': thumb_url, 'ext': 'jpg'}]
+
 
 class AfreecaTVIE(AfreecaTVBaseIE):
     IE_NAME = 'soop'
@@ -155,7 +163,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
             'uploader': ('writer_nick', {str}),
             'uploader_id': ('bj_id', {str}),
             'duration': ('total_file_duration', {int_or_none(scale=1000)}),
-            'thumbnail': ('thumb', {url_or_none}),
+            'thumbnails': ('thumb', {self._fixup_thumb}),
         })
 
         entries = []
@@ -226,8 +234,7 @@ class AfreecaTVCatchStoryIE(AfreecaTVBaseIE):
 
         return self.playlist_result(self._entries(data), video_id)
 
-    @staticmethod
-    def _entries(data):
+    def _entries(self, data):
         # 'files' is always a list with 1 element
         yield from traverse_obj(data, (
             'data', lambda _, v: v['story_type'] == 'catch',
@@ -238,7 +245,7 @@ class AfreecaTVCatchStoryIE(AfreecaTVBaseIE):
                 'title': ('title', {str}),
                 'uploader': ('writer_nick', {str}),
                 'uploader_id': ('writer_id', {str}),
-                'thumbnail': ('thumb', {url_or_none}),
+                'thumbnails': ('thumb', {self._fixup_thumb}),
                 'timestamp': ('write_timestamp', {int_or_none}),
             }))
 

yt_dlp/extractor/common.py

@@ -279,6 +279,7 @@ class InfoExtractor:
     thumbnails:     A list of dictionaries, with the following entries:
                         * "id" (optional, string) - Thumbnail format ID
                         * "url"
+                        * "ext" (optional, string) - actual image extension if not given in URL
                         * "preference" (optional, int) - quality of the image
                         * "width" (optional, int)
                         * "height" (optional, int)

yt_dlp/extractor/markiza.py

@@ -1,123 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    orderedSet,
-    parse_duration,
-    try_get,
-)
-
-
-class MarkizaIE(InfoExtractor):
-    _WORKING = False
-    _VALID_URL = r'https?://(?:www\.)?videoarchiv\.markiza\.sk/(?:video/(?:[^/]+/)*|embed/)(?P<id>\d+)(?:[_/]|$)'
-    _TESTS = [{
-        'url': 'http://videoarchiv.markiza.sk/video/oteckovia/84723_oteckovia-109',
-        'md5': 'ada4e9fad038abeed971843aa028c7b0',
-        'info_dict': {
-            'id': '139078',
-            'ext': 'mp4',
-            'title': 'Oteckovia 109',
-            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 2760,
-        },
-    }, {
-        'url': 'http://videoarchiv.markiza.sk/video/televizne-noviny/televizne-noviny/85430_televizne-noviny',
-        'info_dict': {
-            'id': '85430',
-            'title': 'Televízne noviny',
-        },
-        'playlist_count': 23,
-    }, {
-        'url': 'http://videoarchiv.markiza.sk/video/oteckovia/84723',
-        'only_matching': True,
-    }, {
-        'url': 'http://videoarchiv.markiza.sk/video/84723',
-        'only_matching': True,
-    }, {
-        'url': 'http://videoarchiv.markiza.sk/video/filmy/85190_kamenak',
-        'only_matching': True,
-    }, {
-        'url': 'http://videoarchiv.markiza.sk/video/reflex/zo-zakulisia/84651_pribeh-alzbetky',
-        'only_matching': True,
-    }, {
-        'url': 'http://videoarchiv.markiza.sk/embed/85295',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        data = self._download_json(
-            'http://videoarchiv.markiza.sk/json/video_jwplayer7.json',
-            video_id, query={'id': video_id})
-
-        info = self._parse_jwplayer_data(data, m3u8_id='hls', mpd_id='dash')
-
-        if info.get('_type') == 'playlist':
-            info.update({
-                'id': video_id,
-                'title': try_get(
-                    data, lambda x: x['details']['name'], str),
-            })
-        else:
-            info['duration'] = parse_duration(
-                try_get(data, lambda x: x['details']['duration'], str))
-        return info
-
-
-class MarkizaPageIE(InfoExtractor):
-    _WORKING = False
-    _VALID_URL = r'https?://(?:www\.)?(?:(?:[^/]+\.)?markiza|tvnoviny)\.sk/(?:[^/]+/)*(?P<id>\d+)_'
-    _TESTS = [{
-        'url': 'http://www.markiza.sk/soubiz/zahranicny/1923705_oteckovia-maju-svoj-den-ti-slavni-nie-su-o-nic-menej-rozkosni',
-        'md5': 'ada4e9fad038abeed971843aa028c7b0',
-        'info_dict': {
-            'id': '139355',
-            'ext': 'mp4',
-            'title': 'Oteckovia 110',
-            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 2604,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://dajto.markiza.sk/filmy-a-serialy/1774695_frajeri-vo-vegas',
-        'only_matching': True,
-    }, {
-        'url': 'http://superstar.markiza.sk/aktualne/1923870_to-je-ale-telo-spevacka-ukazala-sexy-postavicku-v-bikinach',
-        'only_matching': True,
-    }, {
-        'url': 'http://hybsa.markiza.sk/aktualne/1923790_uzasna-atmosfera-na-hybsa-v-poprade-superstaristi-si-prve-koncerty-pred-davom-ludi-poriadne-uzili',
-        'only_matching': True,
-    }, {
-        'url': 'http://doma.markiza.sk/filmy/1885250_moja-vysnivana-svadba',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.tvnoviny.sk/domace/1923887_po-smrti-manzela-ju-cakalo-poriadne-prekvapenie',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if MarkizaIE.suitable(url) else super().suitable(url)
-
-    def _real_extract(self, url):
-        playlist_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            # Downloading for some hosts (e.g. dajto, doma) fails with 500
-            # although everything seems to be OK, so considering 500
-            # status code to be expected.
-            url, playlist_id, expected_status=500)
-
-        entries = [
-            self.url_result(f'http://videoarchiv.markiza.sk/video/{video_id}')
-            for video_id in orderedSet(re.findall(
-                r'(?:initPlayer_|data-entity=["\']|id=["\']player_)(\d+)',
-                webpage))]
-
-        return self.playlist_result(entries, playlist_id)

yt_dlp/extractor/nova.py

@@ -6,14 +6,20 @@ from ..utils import (
     determine_ext,
     int_or_none,
     js_to_json,
-    traverse_obj,
+    strip_or_none,
     unified_strdate,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class NovaEmbedIE(InfoExtractor):
-    _VALID_URL = r'https?://media(?:tn)?\.cms\.nova\.cz/embed/(?P<id>[^/?#&]+)'
+    _DOMAINS = [
+        r'media(?:tn)?\.cms\.nova\.cz',
+        r'media\.cms\.(?:markiza|tvnoviny)\.sk',
+    ]
+    _VALID_URL = [rf'https?://{domain}/embed/(?P<id>[^/?#&"\']+)' for domain in _DOMAINS]
+    _EMBED_REGEX = [rf'(?x)<iframe[^>]+\b(?:data-)?src=["\'](?P<url>{url})' for url in _VALID_URL]
     _TESTS = [{
         'url': 'https://media.cms.nova.cz/embed/8o0n0r?autoplay=1',
         'info_dict': {
@@ -43,19 +49,179 @@ class NovaEmbedIE(InfoExtractor):
             'id': 'EU5ELEsmOHt',
             'ext': 'mp4',
             'title': 'Haptické křeslo, bionická ruka nebo roboti. Reportérka se podívala na Týden inovací',
-            'thumbnail': r're:^https?://.*\.jpg',
+            'thumbnail': r're:^https?://cloudia\.cms\.nova\.cz/.+',
             'duration': 1780,
         },
         'params': {'skip_download': 'm3u8'},
     }]
+    _WEBPAGE_TESTS = [{
+        'url': 'http://www.markiza.sk/soubiz/zahranicny/1923705_oteckovia-maju-svoj-den-ti-slavni-nie-su-o-nic-menej-rozkosni',
+        'md5': 'a478390ea7f36aeb36004a107db8b031',
+        'info_dict': {
+            'id': '4q3zP2DsORO',
+            'ext': 'mp4',
+            'title': 'Oteckovia 110',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 2603,
+        },
+    }, {
+        'url': 'https://tvnoviny.sk/domace/clanok/141815-byvaly-sportovec-udajne-vyrabal-mast-z-marihuany-sud-mu-vymeral-20-rocny-trest-a-vzal-aj-rodinny-dom',
+        'md5': '51de0754352a36b4d623f98c9636a5e1',
+        'info_dict': {
+            'id': '2LcfYRqGuYP',
+            'ext': 'mp4',
+            'title': 'Marihuanový mastičkár si vypočul vysoký trest a prepad majetku',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 119,
+        },
+    }, {
+        'url': 'https://tvnoviny.sk/domace/clanok/144055-robert-z-kosic-dostal-najnizsi-mozny-trest-za-to-co-spravil-je-to-aj-tak-vela-tvrdia-blizki',
+        'md5': 'c9a8467b37951877336a9ae6309558b0',
+        'info_dict': {
+            'id': '82N7FrJK7cR',
+            'ext': 'mp4',
+            'title': 'Robovi z Košíc znížili trest za marihuanu, odsúdili ho na päť rokov',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 152,
+        },
+    }, {
+        'url': 'https://tvnoviny.sk/domace/clanok/338907-preco-sa-mnozia-utoky-tinedzerov-podla-psychologiciek-je-za-tym-rastuca-frustracia',
+        'md5': '869b589e99d7c19dd66f024a7d088502',
+        'info_dict': {
+            'id': 'DeiezcjCJmg',
+            'ext': 'mp4',
+            'title': '2022-11-03-TN-2-Nasilie-medzi-mladymi',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 142,
+        },
+    }, {
+        'url': 'http://tvnoviny.sk/domace/clanok/890183-vlada-chysta-postavit-novu-nemocnicu-v-presove-informoval-premier-robert-fico',
+        'md5': 'b9ef0b4917deee2c930f2248b568a90c',
+        'info_dict': {
+            'id': '7VCyuyfGsNZ',
+            'ext': 'mp4',
+            'title': '2024-04-15-PTN-1-Co-caka-zdravotnictvo',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 137,
+        },
+    }, {
+        'url': 'https://www.markiza.sk/live/1-markiza',
+        'info_dict': {
+            'id': 'markiza-live',
+            'ext': 'mp4',
+            'title': r're:^CRA Markiza SD \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+            'thumbnail': r're:^https?://cloudia\.cms\.markiza\.sk/.+',
+            'live_status': 'is_live',
+        },
+    }, {
+        'url': 'http://www.tvnoviny.sk/domace/1923887_po-smrti-manzela-ju-cakalo-poriadne-prekvapenie',
+        'md5': 'e3e0f1e98172ea64147cada308276df8',
+        'info_dict': {
+            'id': 'JxqRvQkFwHK',
+            'ext': 'mp4',
+            'title': 'Po smrti manžela ju čakalo prekvapenie',
+            'thumbnail': r're:^https?://.*\.(?:jpg)',
+            'duration': 108,
+        },
+    }, {
+        'url': 'http://videoarchiv.markiza.sk/video/reflex/zo-zakulisia/84651_pribeh-alzbetky',
+        'md5': 'b40d04d5cb4cf529e2ff14d6726a3548',
+        'info_dict': {
+            'id': '9ZnlOQp2MRa',
+            'ext': 'mp4',
+            'title': 'Príbeh Alžbetky',
+            'thumbnail': r're:^https?://.*\.(?:jpg)',
+            'duration': 361,
+        },
+    }, {
+        'url': 'https://www.markiza.sk/relacie/superstar/clanok/549972-v-zakulisi-superstar-to-bolo-obcas-drsne-moderator-priznal-ze-musel-pouzit-aj-hrubu-silu',
+        'info_dict': {
+            'id': '549972-v-zakulisi-superstar-to-bolo-obcas-drsne-moderator-priznal-ze-musel-pouzit-aj-hrubu-silu',
+            'title': 'V zákulisí SuperStar to bolo občas drsné. Moderátor priznal, že musel použiť aj hrubú silu | TV Markíza',
+            'description': 'md5:02e240e302bddfd0cd352bc886d95161',
+            'thumbnail': r're:^https?://cmesk-ott-images-avod\.ssl\.cdn\.cra\.cz/.+',
+            'age_limit': 0,
+        },
+        'playlist_count': 2,
+    }, {
+        'url': 'https://voyo.markiza.sk/filmy/6702-vysnivana-svadba',
+        'info_dict': {
+            'id': '20kSOHBD8DQ',
+            'title': 'Vysnívaná svadba - 0000',
+            'thumbnail': r're:^https?://.*\.(?:jpg)',
+            'duration': 4924,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'Requested format is not available',
+            'This video is DRM protected',
+        ],
+        'skip': 'premium member only',
+    }, {
+        # Another URLs:
+        #   http://videoarchiv.markiza.sk/video/84723
+        'url': 'http://videoarchiv.markiza.sk/video/oteckovia/84723_oteckovia-109',
+        'info_dict': {
+            'id': '2a5fQmhjvYm',
+            'title': 'Oteckovia 109',
+            'thumbnail': r're:^https?://.*\.(?:jpg)',
+            'duration': 2759,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'Requested format is not available',
+            'This video is DRM protected',
+        ],
+        'skip': 'premium member only',
+    }, {
+        'url': 'https://voyo.markiza.sk/filmy/1377-frajeri-vo-vegas#player-fullscreen',
+        'info_dict': {
+            'id': '1377-frajeri-vo-vegas#player-fullscreen',
+            'title': 'Frajeri vo Vegas | Voyo',
+            'description': 'md5:7f16168f669f144986d862312949627c',
+            'thumbnail': r're:^https?://cmesk-ott-images-svod\.ssl\.cdn\.cra\.cz/.+',
+            'age_limit': 0,
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'K8H4IvKNBbw',
+                'ext': 'mp4',
+                'title': 'frajeri-vo-vegas-hd-15_frajeri-trailer',
+                'duration': 90,
+                'thumbnail': r're:^https?://.*\.(?:jpg)',
+            },
+        },
+            # BUG: The 2nd item (CDjGcqcCYKy) is the movie itself and it's DRM-protected.
+            #      The "ext" field can neither be here nor omitted.
+        ],
+        'playlist_count': 2,
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'Requested format is not available',
+            'This video is DRM protected',
+        ],
+        'skip': 'premium member only',
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(url, video_id)
+        if 'player_not_logged_in' in webpage:
+            self.raise_login_required()
 
         has_drm = False
         duration = None
+        is_live = False
         formats = []
 
         def process_format_list(format_list, format_id=''):
@@ -77,11 +243,11 @@ class NovaEmbedIE(InfoExtractor):
                     formats.extend(self._extract_m3u8_formats(
                         format_url, video_id, 'mp4',
                         entry_protocol='m3u8_native', m3u8_id='hls',
-                        fatal=False))
+                        fatal=False, headers={'Referer': url}))
                 elif (format_type == 'application/dash+xml'
                       or format_id == 'DASH' or ext == 'mpd'):
                     formats.extend(self._extract_mpd_formats(
-                        format_url, video_id, mpd_id='dash', fatal=False))
+                        format_url, video_id, mpd_id='dash', fatal=False, headers={'Referer': url}))
                 else:
                     formats.append({
                         'url': format_url,
@@ -93,6 +259,7 @@ class NovaEmbedIE(InfoExtractor):
             for src in traverse_obj(player, ('lib', 'source', 'sources', ...)):
                 process_format_list(src)
             duration = traverse_obj(player, ('sourceInfo', 'duration', {int_or_none}))
+            is_live = player.get('isLive', False)
         if not formats and not has_drm:
             # older code path, in use before August 2023
             player = self._parse_json(
@@ -108,11 +275,11 @@ class NovaEmbedIE(InfoExtractor):
         if not formats and has_drm:
             self.report_drm(video_id)
 
-        title = self._og_search_title(
+        title = strip_or_none(self._og_search_title(
             webpage, default=None) or self._search_regex(
             (r'<value>(?P<title>[^<]+)',
              r'videoTitle\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1'), webpage,
-            'title', group='value')
+            'title', group='value'))
         thumbnail = self._og_search_thumbnail(
             webpage, default=None) or self._search_regex(
             r'poster\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
@@ -127,6 +294,8 @@ class NovaEmbedIE(InfoExtractor):
             'thumbnail': thumbnail,
             'duration': duration,
             'formats': formats,
+            'http_headers': {'Referer': url},
+            'is_live': is_live,
         }
 
 

yt_dlp/utils/_utils.py

@@ -216,7 +216,7 @@ def partial_application(func):
     sig = inspect.signature(func)
     required_args = [
         param.name for param in sig.parameters.values()
-        if param.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.VAR_POSITIONAL)
+        if param.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)
         if param.default is inspect.Parameter.empty
     ]
 
@@ -4837,7 +4837,6 @@ def number_of_digits(number):
     return len('%d' % number)
 
 
-@partial_application
 def join_nonempty(*values, delim='-', from_dict=None):
     if from_dict is not None:
         values = (traversal.traverse_obj(from_dict, variadic(v)) for v in values)

yt_dlp/utils/traversal.py

@@ -332,14 +332,14 @@ class _RequiredError(ExtractorError):
 
 
 @typing.overload
-def subs_list_to_dict(*, ext: str | None = None) -> collections.abc.Callable[[list[dict]], dict[str, list[dict]]]: ...
+def subs_list_to_dict(*, lang: str | None = 'und', ext: str | None = None) -> collections.abc.Callable[[list[dict]], dict[str, list[dict]]]: ...
 
 
 @typing.overload
-def subs_list_to_dict(subs: list[dict] | None, /, *, ext: str | None = None) -> dict[str, list[dict]]: ...
+def subs_list_to_dict(subs: list[dict] | None, /, *, lang: str | None = 'und', ext: str | None = None) -> dict[str, list[dict]]: ...
 
 
-def subs_list_to_dict(subs: list[dict] | None = None, /, *, ext=None):
+def subs_list_to_dict(subs: list[dict] | None = None, /, *, lang='und', ext=None):
     """
     Convert subtitles from a traversal into a subtitle dict.
     The path should have an `all` immediately before this function.
@@ -352,7 +352,7 @@ def subs_list_to_dict(subs: list[dict] | None = None, /, *, ext=None):
     `quality`  The sort order for each subtitle
     """
     if subs is None:
-        return functools.partial(subs_list_to_dict, ext=ext)
+        return functools.partial(subs_list_to_dict, lang=lang, ext=ext)
 
     result = collections.defaultdict(list)
 
@@ -360,9 +360,15 @@ def subs_list_to_dict(subs: list[dict] | None = None, /, *, ext=None):
         if not url_or_none(sub.get('url')) and not sub.get('data'):
             continue
         sub_id = sub.pop('id', None)
-        if sub_id is None:
+        if not isinstance(sub_id, str):
+            if not lang:
                 continue
-        if ext is not None and not sub.get('ext'):
+            sub_id = lang
+        sub_ext = sub.get('ext')
+        if not isinstance(sub_ext, str):
+            if not ext:
+                sub.pop('ext', None)
+            else:
                 sub['ext'] = ext
         result[sub_id].append(sub)
     result = dict(result)
@@ -452,9 +458,9 @@ def trim_str(*, start=None, end=None):
     return trim
 
 
-def unpack(func):
+def unpack(func, **kwargs):
     @functools.wraps(func)
-    def inner(items, **kwargs):
+    def inner(items):
         return func(*items, **kwargs)
 
     return inner