Merge 8b3127cf67 into f9d98509a8

2024-11-27 17:51:24 +01:00 · 2024-11-17 20:35:13 +01:00
11 changed files with 122 additions and 211 deletions
--- a/README.md
+++ b/README.md
@ -342,9 +342,8 @@ If you fork the project on GitHub, you can run your fork's [build workflow](.git
                                    extractor plugins; postprocessor plugins can
                                    only be loaded from the default plugin
                                    directories
-    --flat-playlist                 Do not extract a playlist's URL result
-                                    entries; some entry metadata may be missing
-                                    and downloading may be bypassed
+    --flat-playlist                 Do not extract the videos of a playlist,
+                                    only list them
    --no-flat-playlist              Fully extract the videos of a playlist
                                    (default)
    --live-from-start               Download livestreams from the start.
@ -1870,9 +1869,6 @@ The following extractors use this feature:
 #### digitalconcerthall
 * `prefer_combined_hls`: Prefer extracting combined/pre-merged video and audio HLS formats. This will exclude 4K/HEVC video and lossless/FLAC audio formats, which are only available as split video/audio HLS formats

-#### sonylivseries
-* `sort_order`: Episode sort order for series extraction - one of `asc` (ascending, oldest first) or `desc` (descending, newest first). Default is `asc`
-
 **Note**: These options may be changed/removed in the future without concern for backward compatibility

 <!-- MANPAGE: MOVE "INSTALLATION" SECTION HERE -->
--- a/devscripts/changelog_override.json
+++ b/devscripts/changelog_override.json
@ -234,10 +234,5 @@
        "when": "57212a5f97ce367590aaa5c3e9a135eead8f81f7",
        "short": "[ie/vimeo] Fix API retries (#11351)",
        "authors": ["bashonly"]
-    },
-    {
-        "action": "add",
-        "when": "52c0ffe40ad6e8404d93296f575007b05b04c686",
-        "short": "[priority] **Login with OAuth is no longer supported for YouTube**\nDue to a change made by the site, yt-dlp is longer able to support OAuth login for YouTube. [Read more](https://github.com/yt-dlp/yt-dlp/issues/11462#issuecomment-2471703090)"
    }
 ]
--- a/yt_dlp/extractor/bandlab.py
+++ b/yt_dlp/extractor/bandlab.py
@ -1,3 +1,4 @@
+
 from .common import InfoExtractor
 from ..utils import (
    ExtractorError,
--- a/yt_dlp/extractor/common.py
+++ b/yt_dlp/extractor/common.py
@ -3767,7 +3767,7 @@ class InfoExtractor:
        """ Merge subtitle dictionaries, language by language. """
        if target is None:
            target = {}
-        for d in filter(None, dicts):
+        for d in dicts:
            for lang, subs in d.items():
                target[lang] = cls._merge_subtitle_items(target.get(lang, []), subs)
        return target
--- a/yt_dlp/extractor/ctvnews.py
+++ b/yt_dlp/extractor/ctvnews.py
@ -1,24 +1,11 @@
-import json
 import re
-import urllib.parse

 from .common import InfoExtractor
-from .ninecninemedia import NineCNineMediaIE
-from ..utils import extract_attributes, orderedSet
-from ..utils.traversal import find_element, traverse_obj
+from ..utils import orderedSet


 class CTVNewsIE(InfoExtractor):
-    _BASE_REGEX = r'https?://(?:[^.]+\.)?ctvnews\.ca/'
-    _VIDEO_ID_RE = r'(?P<id>\d{5,})'
-    _PLAYLIST_ID_RE = r'(?P<id>\d\.\d{5,})'
-    _VALID_URL = [
-        rf'{_BASE_REGEX}video/c{_VIDEO_ID_RE}',
-        rf'{_BASE_REGEX}video(?:-gallery)?/?\?clipId={_VIDEO_ID_RE}',
-        rf'{_BASE_REGEX}video/?\?(?:playlist|bin)Id={_PLAYLIST_ID_RE}',
-        rf'{_BASE_REGEX}(?!video/)[^?#]*?{_PLAYLIST_ID_RE}/?(?:$|[?#])',
-        rf'{_BASE_REGEX}(?!video/)[^?#]+\?binId={_PLAYLIST_ID_RE}',
-    ]
+    _VALID_URL = r'https?://(?:.+?\.)?ctvnews\.ca/(?:video\?(?:clip|playlist|bin)Id=|.*?)(?P<id>[0-9.]+)(?:$|[#?&])'
    _TESTS = [{
        'url': 'http://www.ctvnews.ca/video?clipId=901995',
        'md5': 'b608f466c7fa24b9666c6439d766ab7e',
@ -30,32 +17,13 @@ class CTVNewsIE(InfoExtractor):
            'timestamp': 1467286284,
            'upload_date': '20160630',
            'categories': [],
-            'season_number': 0,
-            'season': 'Season 0',
            'tags': [],
-            'series': 'CTV News National | Archive | Stories 2',
-            'season_id': '57981',
-            'thumbnail': r're:https?://.*\.jpg$',
+            'season_id': 57981,
            'duration': 764.631,
-        },
-    }, {
-        'url': 'https://barrie.ctvnews.ca/video/c3030933-here_s-what_s-making-news-for-nov--15?binId=1272429',
-        'md5': '8b8c2b33c5c1803e3c26bc74ff8694d5',
-        'info_dict': {
-            'id': '3030933',
-            'ext': 'flv',
-            'title': 'Here’s what’s making news for Nov. 15',
-            'description': 'Here are the top stories we’re working on for CTV News at 11 for Nov. 15',
-            'thumbnail': 'http://images2.9c9media.com/image_asset/2021_2_22_a602e68e-1514-410e-a67a-e1f7cccbacab_png_2000x1125.jpg',
-            'season_id': '58104',
-            'season_number': 0,
-            'tags': [],
+            'series': 'CTV News National story',
+            'thumbnail': r're:^https?://.*\.jpg$',
            'season': 'Season 0',
-            'categories': [],
-            'series': 'CTV News Barrie',
-            'upload_date': '20241116',
-            'duration': 42.943,
-            'timestamp': 1731722452,
+            'season_number': 0,
        },
    }, {
        'url': 'http://www.ctvnews.ca/video?playlistId=1.2966224',
@ -78,65 +46,6 @@ class CTVNewsIE(InfoExtractor):
            'id': '1.5736957',
        },
        'playlist_mincount': 6,
-    }, {
-        'url': 'https://www.ctvnews.ca/business/respondents-to-bank-of-canada-questionnaire-largely-oppose-creating-a-digital-loonie-1.6665797',
-        'md5': '24bc4b88cdc17d8c3fc01dfc228ab72c',
-        'info_dict': {
-            'id': '2695026',
-            'ext': 'flv',
-            'season_id': '89852',
-            'series': 'From CTV News Channel',
-            'description': 'md5:796a985a23cacc7e1e2fafefd94afd0a',
-            'season': '2023',
-            'title': 'Bank of Canada asks public about digital currency',
-            'categories': [],
-            'tags': [],
-            'upload_date': '20230526',
-            'season_number': 2023,
-            'thumbnail': 'http://images2.9c9media.com/image_asset/2019_3_28_35f5afc3-10f6-4d92-b194-8b9a86f55c6a_png_1920x1080.jpg',
-            'timestamp': 1685105157,
-            'duration': 253.553,
-        },
-    }, {
-        'url': 'https://stox.ctvnews.ca/video-gallery?clipId=582589',
-        'md5': '135cc592df607d29dddc931f1b756ae2',
-        'info_dict': {
-            'id': '582589',
-            'ext': 'flv',
-            'categories': [],
-            'timestamp': 1427906183,
-            'season_number': 0,
-            'duration': 125.559,
-            'thumbnail': 'http://images2.9c9media.com/image_asset/2019_3_28_35f5afc3-10f6-4d92-b194-8b9a86f55c6a_png_1920x1080.jpg',
-            'series': 'CTV News Stox',
-            'description': 'CTV original footage of the rise and fall of the Berlin Wall.',
-            'title': 'Berlin Wall',
-            'season_id': '63817',
-            'season': 'Season 0',
-            'tags': [],
-            'upload_date': '20150401',
-        },
-    }, {
-        'url': 'https://ottawa.ctvnews.ca/features/regional-contact/regional-contact-archive?binId=1.1164587#3023759',
-        'md5': 'a14c0603557decc6531260791c23cc5e',
-        'info_dict': {
-            'id': '3023759',
-            'ext': 'flv',
-            'season_number': 2024,
-            'timestamp': 1731798000,
-            'season': '2024',
-            'episode': 'Episode 125',
-            'description': 'CTV News Ottawa at Six',
-            'duration': 2712.076,
-            'episode_number': 125,
-            'upload_date': '20241116',
-            'title': 'CTV News Ottawa at Six for Saturday, November 16, 2024',
-            'thumbnail': 'http://images2.9c9media.com/image_asset/2019_3_28_35f5afc3-10f6-4d92-b194-8b9a86f55c6a_png_1920x1080.jpg',
-            'categories': [],
-            'tags': [],
-            'series': 'CTV News Ottawa at Six',
-            'season_id': '92667',
-        },
    }, {
        'url': 'http://www.ctvnews.ca/1.810401',
        'only_matching': True,
@ -148,35 +57,29 @@ class CTVNewsIE(InfoExtractor):
        'only_matching': True,
    }]

-    def _ninecninemedia_url_result(self, clip_id):
-        return self.url_result(f'9c9media:ctvnews_web:{clip_id}', NineCNineMediaIE, clip_id)
-
    def _real_extract(self, url):
        page_id = self._match_id(url)

-        if mobj := re.fullmatch(self._VIDEO_ID_RE, urllib.parse.urlparse(url).fragment):
-            page_id = mobj.group('id')
+        def ninecninemedia_url_result(clip_id):
+            return {
+                '_type': 'url_transparent',
+                'id': clip_id,
+                'url': f'9c9media:ctvnews_web:{clip_id}',
+                'ie_key': 'NineCNineMedia',
+            }

-        if re.fullmatch(self._VIDEO_ID_RE, page_id):
-            return self._ninecninemedia_url_result(page_id)
-
-        webpage = self._download_webpage(f'https://www.ctvnews.ca/{page_id}', page_id, query={
-            'ot': 'example.AjaxPageLayout.ot',
-            'maxItemsPerPage': 1000000,
-        })
-        entries = [self._ninecninemedia_url_result(clip_id)
-                   for clip_id in orderedSet(re.findall(r'clip\.id\s*=\s*(\d+);', webpage))]
-        if not entries:
-            webpage = self._download_webpage(url, page_id)
-            if 'getAuthStates("' in webpage:
-                entries = [self._ninecninemedia_url_result(clip_id) for clip_id in
-                           self._search_regex(r'getAuthStates\("([\d+,]+)"', webpage, 'clip ids').split(',')]
-            else:
-                entries = [
-                    self._ninecninemedia_url_result(clip_id) for clip_id in
-                    traverse_obj(webpage, (
-                        {find_element(tag='jasper-player-container', html=True)},
-                        {extract_attributes}, 'axis-ids', {json.loads}, ..., 'axisId', {str}))
-                ]
-
-        return self.playlist_result(entries, page_id)
+        if page_id.isdigit():
+            return ninecninemedia_url_result(page_id)
+        else:
+            webpage = self._download_webpage(f'http://www.ctvnews.ca/{page_id}', page_id, query={
+                'ot': 'example.AjaxPageLayout.ot',
+                'maxItemsPerPage': 1000000,
+            })
+            entries = [ninecninemedia_url_result(clip_id) for clip_id in orderedSet(
+                re.findall(r'clip\.id\s*=\s*(\d+);', webpage))]
+            if not entries:
+                webpage = self._download_webpage(url, page_id)
+                if 'getAuthStates("' in webpage:
+                    entries = [ninecninemedia_url_result(clip_id) for clip_id in
+                               self._search_regex(r'getAuthStates\("([\d+,]+)"', webpage, 'clip ids').split(',')]
+            return self.playlist_result(entries, page_id)
--- a/yt_dlp/extractor/facebook.py
+++ b/yt_dlp/extractor/facebook.py
@ -569,7 +569,7 @@ class FacebookIE(InfoExtractor):
            if dash_manifest:
                formats.extend(self._parse_mpd_formats(
                    compat_etree_fromstring(urllib.parse.unquote_plus(dash_manifest)),
-                    mpd_url=url_or_none(vid_data.get('dash_manifest_url')) or mpd_url))
+                    mpd_url=url_or_none(video.get('dash_manifest_url')) or mpd_url))

        def process_formats(info):
            # Downloads with browser's User-Agent are rate limited. Working around
--- a/yt_dlp/extractor/litv.py
+++ b/yt_dlp/extractor/litv.py
@ -1,32 +1,30 @@
 import json
-import uuid

 from .common import InfoExtractor
 from ..utils import (
    ExtractorError,
    int_or_none,
-    join_nonempty,
    smuggle_url,
    traverse_obj,
    try_call,
    unsmuggle_url,
-    urljoin,
 )


 class LiTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?litv\.tv/(?:[^/?#]+/watch/|vod/[^/?#]+/content\.do\?content_id=)(?P<id>[\w-]+)'
-    _URL_TEMPLATE = 'https://www.litv.tv/%s/watch/%s'
-    _GEO_COUNTRIES = ['TW']
+    _VALID_URL = r'https?://(?:www\.)?litv\.tv/(?:vod|promo)/[^/]+/(?:content\.do)?\?.*?\b(?:content_)?id=(?P<id>[^&]+)'
+
+    _URL_TEMPLATE = 'https://www.litv.tv/vod/%s/content.do?content_id=%s'
+
    _TESTS = [{
-        'url': 'https://www.litv.tv/drama/watch/VOD00041610',
+        'url': 'https://www.litv.tv/vod/drama/content.do?brc_id=root&id=VOD00041610&isUHEnabled=true&autoPlay=1',
        'info_dict': {
            'id': 'VOD00041606',
            'title': '花千骨',
        },
        'playlist_count': 51,  # 50 episodes + 1 trailer
    }, {
-        'url': 'https://www.litv.tv/drama/watch/VOD00041610',
+        'url': 'https://www.litv.tv/vod/drama/content.do?brc_id=root&id=VOD00041610&isUHEnabled=true&autoPlay=1',
        'md5': 'b90ff1e9f1d8f5cfcd0a44c3e2b34c7a',
        'info_dict': {
            'id': 'VOD00041610',
@ -34,15 +32,16 @@ class LiTVIE(InfoExtractor):
            'title': '花千骨第1集',
            'thumbnail': r're:https?://.*\.jpg$',
            'description': '《花千骨》陸劇線上看。十六年前，平靜的村莊內，一名女嬰隨異相出生，途徑此地的蜀山掌門清虛道長算出此女命運非同一般，她體內散發的異香易招惹妖魔。一念慈悲下，他在村莊周邊設下結界阻擋妖魔入侵，讓其年滿十六後去蜀山，並賜名花千骨。',
-            'categories': ['奇幻', '愛情', '仙俠', '古裝'],
+            'categories': ['奇幻', '愛情', '中國', '仙俠'],
            'episode': 'Episode 1',
            'episode_number': 1,
        },
        'params': {
            'noplaylist': True,
        },
+        'skip': 'Georestricted to Taiwan',
    }, {
-        'url': 'https://www.litv.tv/drama/watch/VOD00044841',
+        'url': 'https://www.litv.tv/promo/miyuezhuan/?content_id=VOD00044841&',
        'md5': '88322ea132f848d6e3e18b32a832b918',
        'info_dict': {
            'id': 'VOD00044841',
@ -56,62 +55,94 @@ class LiTVIE(InfoExtractor):
    def _extract_playlist(self, playlist_data, content_type):
        all_episodes = [
            self.url_result(smuggle_url(
-                self._URL_TEMPLATE % (content_type, episode['content_id']),
+                self._URL_TEMPLATE % (content_type, episode['contentId']),
                {'force_noplaylist': True}))  # To prevent infinite recursion
-            for episode in traverse_obj(playlist_data, ('seasons', ..., 'episodes', lambda _, v: v['content_id']))]
+            for episode in traverse_obj(playlist_data, ('seasons', ..., 'episode', lambda _, v: v['contentId']))]

-        return self.playlist_result(all_episodes, playlist_data['content_id'], playlist_data.get('title'))
+        return self.playlist_result(all_episodes, playlist_data['contentId'], playlist_data.get('title'))

    def _real_extract(self, url):
        url, smuggled_data = unsmuggle_url(url, {})
+
        video_id = self._match_id(url)
+
        webpage = self._download_webpage(url, video_id)
-        vod_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']

-        program_info = traverse_obj(vod_data, ('programInformation', {dict})) or {}
-        playlist_data = traverse_obj(vod_data, ('seriesTree'))
-        if playlist_data and self._yes_playlist(program_info.get('series_id'), video_id, smuggled_data):
-            return self._extract_playlist(playlist_data, program_info.get('content_type'))
+        if self._search_regex(
+                r'(?i)<meta\s[^>]*http-equiv="refresh"\s[^>]*content="[0-9]+;\s*url=https://www\.litv\.tv/"',
+                webpage, 'meta refresh redirect', default=False, group=0):
+            raise ExtractorError('No such content found', expected=True)

-        asset_id = traverse_obj(program_info, ('assets', 0, 'asset_id', {str}))
-        if asset_id:  # This is a VOD
-            media_type = 'vod'
-        else:  # This is a live stream
-            asset_id = program_info['content_id']
-            media_type = program_info['content_type']
-        puid = try_call(lambda: self._get_cookies('https://www.litv.tv/')['PUID'].value)
-        if puid:
-            endpoint = 'get-urls'
-        else:
-            puid = str(uuid.uuid4())
-            endpoint = 'get-urls-no-auth'
-        video_data = self._download_json(
-            f'https://www.litv.tv/api/{endpoint}', video_id,
-            data=json.dumps({'AssetId': asset_id, 'MediaType': media_type, 'puid': puid}).encode(),
-            headers={'Content-Type': 'application/json'})
+        program_info = self._parse_json(self._search_regex(
+            r'var\s+programInfo\s*=\s*([^;]+)', webpage, 'VOD data', default='{}'),
+            video_id)

-        if error := traverse_obj(video_data, ('error', {dict})):
-            error_msg = traverse_obj(error, ('message', {str}))
-            if error_msg and 'OutsideRegionError' in error_msg:
+        # In browsers `getProgramInfo` request is always issued. Usually this
+        # endpoint gives the same result as the data embedded in the webpage.
+        # If, for some reason, there are no embedded data, we do an extra request.
+        if 'assetId' not in program_info:
+            program_info = self._download_json(
+                'https://www.litv.tv/vod/ajax/getProgramInfo', video_id,
+                query={'contentId': video_id},
+                headers={'Accept': 'application/json'})
+
+        series_id = program_info['seriesId']
+        if self._yes_playlist(series_id, video_id, smuggled_data):
+            playlist_data = self._download_json(
+                'https://www.litv.tv/vod/ajax/getSeriesTree', video_id,
+                query={'seriesId': series_id}, headers={'Accept': 'application/json'})
+            return self._extract_playlist(playlist_data, program_info['contentType'])
+
+        video_data = self._parse_json(self._search_regex(
+            r'uiHlsUrl\s*=\s*testBackendData\(([^;]+)\);',
+            webpage, 'video data', default='{}'), video_id)
+        if not video_data:
+            payload = {'assetId': program_info['assetId']}
+            puid = try_call(lambda: self._get_cookies('https://www.litv.tv/')['PUID'].value)
+            if puid:
+                payload.update({
+                    'type': 'auth',
+                    'puid': puid,
+                })
+                endpoint = 'getUrl'
+            else:
+                payload.update({
+                    'watchDevices': program_info['watchDevices'],
+                    'contentType': program_info['contentType'],
+                })
+                endpoint = 'getMainUrlNoAuth'
+            video_data = self._download_json(
+                f'https://www.litv.tv/vod/ajax/{endpoint}', video_id,
+                data=json.dumps(payload).encode(),
+                headers={'Content-Type': 'application/json'})
+
+        if not video_data.get('fullpath'):
+            error_msg = video_data.get('errorMessage')
+            if error_msg == 'vod.error.outsideregionerror':
                self.raise_geo_restricted('This video is available in Taiwan only')
-            elif error_msg:
+            if error_msg:
                raise ExtractorError(f'{self.IE_NAME} said: {error_msg}', expected=True)
-            raise ExtractorError(f'Unexpected error from {self.IE_NAME}')
+            raise ExtractorError(f'Unexpected result from {self.IE_NAME}')

        formats = self._extract_m3u8_formats(
-            video_data['result']['AssetURLs'][0], video_id, ext='mp4', m3u8_id='hls')
+            video_data['fullpath'], video_id, ext='mp4',
+            entry_protocol='m3u8_native', m3u8_id='hls')
        for a_format in formats:
            # LiTV HLS segments doesn't like compressions
            a_format.setdefault('http_headers', {})['Accept-Encoding'] = 'identity'

+        title = program_info['title'] + program_info.get('secondaryMark', '')
+        description = program_info.get('description')
+        thumbnail = program_info.get('imageFile')
+        categories = [item['name'] for item in program_info.get('category', [])]
+        episode = int_or_none(program_info.get('episode'))
+
        return {
            'id': video_id,
            'formats': formats,
-            'title': join_nonempty('title', 'secondary_mark', delim='', from_dict=program_info),
-            **traverse_obj(program_info, {
-                'description': ('description', {str}),
-                'thumbnail': ('picture', {urljoin('https://p-cdnstatic.svc.litv.tv/')}),
-                'categories': ('genres', ..., 'name', {str}),
-                'episode_number': ('episode', {int_or_none}),
-            }),
+            'title': title,
+            'description': description,
+            'thumbnail': thumbnail,
+            'categories': categories,
+            'episode_number': episode,
        }
--- a/yt_dlp/extractor/rutube.py
+++ b/yt_dlp/extractor/rutube.py
@ -13,10 +13,7 @@ from ..utils import (
    unified_timestamp,
    url_or_none,
 )
-from ..utils.traversal import (
-    subs_list_to_dict,
-    traverse_obj,
-)
+from ..utils.traversal import traverse_obj


 class RutubeBaseIE(InfoExtractor):
@ -95,11 +92,11 @@ class RutubeBaseIE(InfoExtractor):
                hls_url, video_id, 'mp4', fatal=False, m3u8_id='hls')
            formats.extend(fmts)
            self._merge_subtitles(subs, target=subtitles)
-        self._merge_subtitles(traverse_obj(options, ('captions', ..., {
-            'id': 'code',
-            'url': 'file',
-            'name': ('langTitle', {str}),
-        }, all, {subs_list_to_dict(lang='ru')})), target=subtitles)
+        for caption in traverse_obj(options, ('captions', lambda _, v: url_or_none(v['file']))):
+            subtitles.setdefault(caption.get('code') or 'ru', []).append({
+                'url': caption['file'],
+                'name': caption.get('langTitle'),
+            })
        return formats, subtitles

    def _download_and_extract_formats_and_subtitles(self, video_id, query=None):
--- a/yt_dlp/extractor/sonyliv.py
+++ b/yt_dlp/extractor/sonyliv.py
@ -199,9 +199,8 @@ class SonyLIVSeriesIE(InfoExtractor):
        },
    }]
    _API_BASE = 'https://apiv2.sonyliv.com/AGL'
-    _SORT_ORDERS = ('asc', 'desc')

-    def _entries(self, show_id, sort_order):
+    def _entries(self, show_id):
        headers = {
            'Accept': 'application/json, text/plain, */*',
            'Referer': 'https://www.sonyliv.com',
@ -216,9 +215,6 @@ class SonyLIVSeriesIE(InfoExtractor):
                'from': '0',
                'to': '49',
            }), ('resultObj', 'containers', 0, 'containers', lambda _, v: int_or_none(v['id'])))
-
-        if sort_order == 'desc':
-            seasons = reversed(seasons)
        for season in seasons:
            season_id = str(season['id'])
            note = traverse_obj(season, ('metadata', 'title', {str})) or 'season'
@ -230,7 +226,7 @@ class SonyLIVSeriesIE(InfoExtractor):
                        'from': str(cursor),
                        'to': str(cursor + 99),
                        'orderBy': 'episodeNumber',
-                        'sortOrder': sort_order,
+                        'sortOrder': 'asc',
                    }), ('resultObj', 'containers', 0, 'containers', lambda _, v: int_or_none(v['id'])))
                if not episodes:
                    break
@ -241,10 +237,4 @@ class SonyLIVSeriesIE(InfoExtractor):

    def _real_extract(self, url):
        show_id = self._match_id(url)
-
-        sort_order = self._configuration_arg('sort_order', [self._SORT_ORDERS[0]])[0]
-        if sort_order not in self._SORT_ORDERS:
-            raise ValueError(
-                f'Invalid sort order "{sort_order}". Allowed values are: {", ".join(self._SORT_ORDERS)}')
-
-        return self.playlist_result(self._entries(show_id, sort_order), playlist_id=show_id)
+        return self.playlist_result(self._entries(show_id), playlist_id=show_id)
--- a/yt_dlp/extractor/soundcloud.py
+++ b/yt_dlp/extractor/soundcloud.py
@ -241,7 +241,7 @@ class SoundcloudBaseIE(InfoExtractor):
                    format_urls.add(format_url)
                    formats.append({
                        'format_id': 'download',
-                        'ext': urlhandle_detect_ext(urlh, default='mp3'),
+                        'ext': urlhandle_detect_ext(urlh) or 'mp3',
                        'filesize': int_or_none(urlh.headers.get('Content-Length')),
                        'url': format_url,
                        'quality': 10,
--- a/yt_dlp/options.py
+++ b/yt_dlp/options.py
@ -419,9 +419,7 @@ def create_parser():
    general.add_option(
        '--flat-playlist',
        action='store_const', dest='extract_flat', const='in_playlist', default=False,
-        help=(
-            'Do not extract a playlist\'s URL result entries; '
-            'some entry metadata may be missing and downloading may be bypassed'))
+        help='Do not extract the videos of a playlist, only list them')
    general.add_option(
        '--no-flat-playlist',
        action='store_false', dest='extract_flat',