Merge ea7d7d85d3 into f351440f1d

2024-11-24 00:01:54 +01:00 · 2024-11-17 22:14:24 +01:00
17 changed files with 153 additions and 310 deletions
--- a/12
+++ b/12
@ -695,15 +695,3 @@ KBelmin
 kesor
 MellowKyler
 Wesley107772
-a13ssandr0
-ChocoLZS
-doe1080
-hugovdev
-jshumphrey
-julionc
-manavchaudhary1
-powergold1
-Sakura286
-SamDecrock
-stratus-ss
-subrat-lima
--- a/Changelog.md
+++ b/Changelog.md
@ -4,64 +4,6 @@
 # To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
 -->

-### 2024.11.18
-
-#### Important changes
- **Login with OAuth is no longer supported for YouTube**
-Due 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)
-
-#### Core changes
- [Catch broken Cryptodome installations](https://github.com/yt-dlp/yt-dlp/commit/b83ca24eb72e1e558b0185bd73975586c0bc0546) ([#11486](https://github.com/yt-dlp/yt-dlp/issues/11486)) by [seproDev](https://github.com/seproDev)
- **utils**
-    - [Fix `join_nonempty`, add `**kwargs` to `unpack`](https://github.com/yt-dlp/yt-dlp/commit/39d79c9b9cf23411d935910685c40aa1a2fdb409) ([#11559](https://github.com/yt-dlp/yt-dlp/issues/11559)) by [Grub4K](https://github.com/Grub4K)
-    - `subs_list_to_dict`: [Add `lang` default parameter](https://github.com/yt-dlp/yt-dlp/commit/c014fbcddcb4c8f79d914ac5bb526758b540ea33) ([#11508](https://github.com/yt-dlp/yt-dlp/issues/11508)) by [Grub4K](https://github.com/Grub4K)
-
-#### Extractor changes
- [Allow `ext` override for thumbnails](https://github.com/yt-dlp/yt-dlp/commit/eb64ae7d5def6df2aba74fb703e7f168fb299865) ([#11545](https://github.com/yt-dlp/yt-dlp/issues/11545)) by [bashonly](https://github.com/bashonly)
- **adobepass**: [Fix provider requests](https://github.com/yt-dlp/yt-dlp/commit/85fdc66b6e01d19a94b4f39b58e3c0cf23600902) ([#11472](https://github.com/yt-dlp/yt-dlp/issues/11472)) by [bashonly](https://github.com/bashonly)
- **archive.org**: [Fix comments extraction](https://github.com/yt-dlp/yt-dlp/commit/f2a4983df7a64c4e93b56f79dbd16a781bd90206) ([#11527](https://github.com/yt-dlp/yt-dlp/issues/11527)) by [jshumphrey](https://github.com/jshumphrey)
- **bandlab**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/6365e92589e4bc17b8fffb0125a716d144ad2137) ([#11535](https://github.com/yt-dlp/yt-dlp/issues/11535)) by [seproDev](https://github.com/seproDev)
- **chaturbate**
-    - [Extract from API and support impersonation](https://github.com/yt-dlp/yt-dlp/commit/720b3dc453c342bc2e8df7dbc0acaab4479de46c) ([#11555](https://github.com/yt-dlp/yt-dlp/issues/11555)) by [powergold1](https://github.com/powergold1) (With fixes in [7cecd29](https://github.com/yt-dlp/yt-dlp/commit/7cecd299e4a5ef1f0f044b2fedc26f17e41f15e3) by [seproDev](https://github.com/seproDev))
-    - [Support alternate domains](https://github.com/yt-dlp/yt-dlp/commit/a9f85670d03ab993dc589f21a9ffffcad61392d5) ([#10595](https://github.com/yt-dlp/yt-dlp/issues/10595)) by [manavchaudhary1](https://github.com/manavchaudhary1)
- **cloudflarestream**: [Avoid extraction via videodelivery.net](https://github.com/yt-dlp/yt-dlp/commit/2db8c2e7d57a1784b06057c48e3e91023720d195) ([#11478](https://github.com/yt-dlp/yt-dlp/issues/11478)) by [hugovdev](https://github.com/hugovdev)
- **ctvnews**
-    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f351440f1dc5b3dfbfc5737b037a869d946056fe) ([#11534](https://github.com/yt-dlp/yt-dlp/issues/11534)) by [bashonly](https://github.com/bashonly), [jshumphrey](https://github.com/jshumphrey)
-    - [Fix playlist ID extraction](https://github.com/yt-dlp/yt-dlp/commit/f9d98509a898737c12977b2e2117277bada2c196) ([#8892](https://github.com/yt-dlp/yt-dlp/issues/8892)) by [qbnu](https://github.com/qbnu)
- **digitalconcerthall**: [Support login with access/refresh tokens](https://github.com/yt-dlp/yt-dlp/commit/f7257588bdff5f0b0452635a66b253a783c97357) ([#11571](https://github.com/yt-dlp/yt-dlp/issues/11571)) by [bashonly](https://github.com/bashonly)
- **facebook**: [Fix formats extraction](https://github.com/yt-dlp/yt-dlp/commit/bacc31b05a04181b63100c481565256b14813a5e) ([#11513](https://github.com/yt-dlp/yt-dlp/issues/11513)) by [bashonly](https://github.com/bashonly)
- **gamedevtv**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/be3579aaf0c3b71a0a3195e1955415d5e4d6b3d8) ([#11368](https://github.com/yt-dlp/yt-dlp/issues/11368)) by [bashonly](https://github.com/bashonly), [stratus-ss](https://github.com/stratus-ss)
- **goplay**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/6b43a8d84b881d769b480ba6e20ec691e9d1b92d) ([#11466](https://github.com/yt-dlp/yt-dlp/issues/11466)) by [bashonly](https://github.com/bashonly), [SamDecrock](https://github.com/SamDecrock)
- **kenh14**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/eb15fd5a32d8b35ef515f7a3d1158c03025648ff) ([#3996](https://github.com/yt-dlp/yt-dlp/issues/3996)) by [krichbanana](https://github.com/krichbanana), [pzhlkj6612](https://github.com/pzhlkj6612)
- **litv**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/e079ffbda66de150c0a9ebef05e89f61bb4d5f76) ([#11071](https://github.com/yt-dlp/yt-dlp/issues/11071)) by [jiru](https://github.com/jiru)
- **mixchmovie**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/0ec9bfed4d4a52bfb4f8733da1acf0aeeae21e6b) ([#10897](https://github.com/yt-dlp/yt-dlp/issues/10897)) by [Sakura286](https://github.com/Sakura286)
- **patreon**: [Fix comments extraction](https://github.com/yt-dlp/yt-dlp/commit/1d253b0a27110d174c40faf8fb1c999d099e0cde) ([#11530](https://github.com/yt-dlp/yt-dlp/issues/11530)) by [bashonly](https://github.com/bashonly), [jshumphrey](https://github.com/jshumphrey)
- **pialive**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/d867f99622ef7fba690b08da56c39d739b822bb7) ([#10811](https://github.com/yt-dlp/yt-dlp/issues/10811)) by [ChocoLZS](https://github.com/ChocoLZS)
- **radioradicale**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/70c55cb08f780eab687e881ef42bb5c6007d290b) ([#5607](https://github.com/yt-dlp/yt-dlp/issues/5607)) by [a13ssandr0](https://github.com/a13ssandr0), [pzhlkj6612](https://github.com/pzhlkj6612)
- **reddit**: [Improve error handling](https://github.com/yt-dlp/yt-dlp/commit/7ea2787920cccc6b8ea30791993d114fbd564434) ([#11573](https://github.com/yt-dlp/yt-dlp/issues/11573)) by [bashonly](https://github.com/bashonly)
- **redgifsuser**: [Fix extraction](https://github.com/yt-dlp/yt-dlp/commit/d215fba7edb69d4fa665f43663756fd260b1489f) ([#11531](https://github.com/yt-dlp/yt-dlp/issues/11531)) by [jshumphrey](https://github.com/jshumphrey)
- **rutube**: [Rework extractors](https://github.com/yt-dlp/yt-dlp/commit/e398217aae19bb25f91797bfbe8a3243698d7f45) ([#11480](https://github.com/yt-dlp/yt-dlp/issues/11480)) by [seproDev](https://github.com/seproDev)
- **sonylivseries**: [Add `sort_order` extractor-arg](https://github.com/yt-dlp/yt-dlp/commit/2009cb27e17014787bf63eaa2ada51293d54f22a) ([#11569](https://github.com/yt-dlp/yt-dlp/issues/11569)) by [bashonly](https://github.com/bashonly)
- **soop**: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/c699bafc5038b59c9afe8c2e69175fb66424c832) ([#11545](https://github.com/yt-dlp/yt-dlp/issues/11545)) by [bashonly](https://github.com/bashonly)
- **spankbang**: [Support browser impersonation](https://github.com/yt-dlp/yt-dlp/commit/8388ec256f7753b02488788e3cfa771f6e1db247) ([#11542](https://github.com/yt-dlp/yt-dlp/issues/11542)) by [jshumphrey](https://github.com/jshumphrey)
- **spreaker**
-    - [Support episode pages and access keys](https://github.com/yt-dlp/yt-dlp/commit/c39016f66df76d14284c705736ca73db8055d8de) ([#11489](https://github.com/yt-dlp/yt-dlp/issues/11489)) by [julionc](https://github.com/julionc)
-    - [Support podcast and feed pages](https://github.com/yt-dlp/yt-dlp/commit/c6737310619022248f5d0fd13872073cac168453) ([#10968](https://github.com/yt-dlp/yt-dlp/issues/10968)) by [subrat-lima](https://github.com/subrat-lima)
- **youtube**
-    - [Player client maintenance](https://github.com/yt-dlp/yt-dlp/commit/637d62a3a9fc723d68632c1af25c30acdadeeb85) ([#11528](https://github.com/yt-dlp/yt-dlp/issues/11528)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-    - [Remove broken OAuth support](https://github.com/yt-dlp/yt-dlp/commit/52c0ffe40ad6e8404d93296f575007b05b04c686) ([#11558](https://github.com/yt-dlp/yt-dlp/issues/11558)) by [bashonly](https://github.com/bashonly)
-    - tab: [Fix podcasts tab extraction](https://github.com/yt-dlp/yt-dlp/commit/37cd7660eaff397c551ee18d80507702342b0c2b) ([#11567](https://github.com/yt-dlp/yt-dlp/issues/11567)) by [seproDev](https://github.com/seproDev)
-
-#### Misc. changes
- **build**
-    - [Bump PyInstaller version pin to `>=6.11.1`](https://github.com/yt-dlp/yt-dlp/commit/f9c8deb4e5887ff5150e911ac0452e645f988044) ([#11507](https://github.com/yt-dlp/yt-dlp/issues/11507)) by [bashonly](https://github.com/bashonly)
-    - [Enable attestations for trusted publishing](https://github.com/yt-dlp/yt-dlp/commit/f13df591d4d7ca8e2f31b35c9c91e69ba9e9b013) ([#11420](https://github.com/yt-dlp/yt-dlp/issues/11420)) by [bashonly](https://github.com/bashonly)
-    - [Pin `websockets` version to >=13.0,<14](https://github.com/yt-dlp/yt-dlp/commit/240a7d43c8a67ffb86d44dc276805aa43c358dcc) ([#11488](https://github.com/yt-dlp/yt-dlp/issues/11488)) by [bashonly](https://github.com/bashonly)
- **cleanup**
-    - [Deprecate more compat functions](https://github.com/yt-dlp/yt-dlp/commit/f95a92b3d0169a784ee15a138fbe09d82b2754a1) ([#11439](https://github.com/yt-dlp/yt-dlp/issues/11439)) by [seproDev](https://github.com/seproDev)
-    - [Remove dead extractors](https://github.com/yt-dlp/yt-dlp/commit/10fc719bc7f1eef469389c5219102266ef411f29) ([#11566](https://github.com/yt-dlp/yt-dlp/issues/11566)) by [doe1080](https://github.com/doe1080)
-    - Miscellaneous: [da252d9](https://github.com/yt-dlp/yt-dlp/commit/da252d9d322af3e2178ac5eae324809502a0a862) by [bashonly](https://github.com/bashonly), [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
-
 ### 2024.11.04

 #### Important changes
--- 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.
@ -1867,8 +1866,8 @@ The following extractors use this feature:
 #### bilibili
 * `prefer_multi_flv`: Prefer extracting flv formats over mp4 for older videos that still provide legacy formats

-#### sonylivseries
-* `sort_order`: Episode sort order for series extraction - one of `asc` (ascending, oldest first) or `desc` (descending, newest first). Default is `asc`
+#### 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

 #### bahamut
 * `device_id`: (optional) Device ID got from `https://ani.gamer.com.tw/ajax/getdeviceid.php` (bound to cookies and `User-Agent` HTTP header). The extractor will automatically fetch one if it is not present. E.g. `"bahamut:device_id=1234567890abcdef1234567890abcdef1234567890abcdef1234567890ab"`
--- 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/supportedsites.md
+++ b/supportedsites.md
@ -129,8 +129,6 @@
 - **Bandcamp:album**
 - **Bandcamp:user**
 - **Bandcamp:weekly**
- - **Bandlab**
- - **BandlabPlaylist**
 - **BannedVideo**
 - **bbc**: [*bbc*](## "netrc machine") BBC
 - **bbc.co.uk**: [*bbc*](## "netrc machine") BBC iPlayer
@ -486,7 +484,6 @@
 - **Gab**
 - **GabTV**
 - **Gaia**: [*gaia*](## "netrc machine")
- - **GameDevTVDashboard**: [*gamedevtv*](## "netrc machine")
 - **GameJolt**
 - **GameJoltCommunity**
 - **GameJoltGame**
@ -654,8 +651,6 @@
 - **Karaoketv**
 - **Katsomo**: (**Currently broken**)
 - **KelbyOne**: (**Currently broken**)
- - **Kenh14Playlist**
- - **Kenh14Video**
 - **Ketnet**
 - **khanacademy**
 - **khanacademy:unit**
@ -789,6 +784,10 @@
 - **MicrosoftLearnSession**
 - **MicrosoftMedius**
 - **microsoftstream**: Microsoft Stream
+ - **mildom**: Record ongoing live by specific user in Mildom
+ - **mildom:clip**: Clip in Mildom
+ - **mildom:user:vod**: Download all VODs from specific user in Mildom
+ - **mildom:vod**: VOD in Mildom
 - **minds**
 - **minds:channel**
 - **minds:group**
@ -799,7 +798,6 @@
 - **MiTele**: mitele.es
 - **mixch**
 - **mixch:archive**
- - **mixch:movie**
 - **mixcloud**
 - **mixcloud:playlist**
 - **mixcloud:user**
@ -1062,8 +1060,8 @@
 - **PhilharmonieDeParis**: Philharmonie de Paris
 - **phoenix.de**
 - **Photobucket**
- - **PiaLive**
 - **Piapro**: [*piapro*](## "netrc machine")
+ - **PIAULIZAPortal**: ulizaportal.jp - PIA LIVE STREAM
 - **Picarto**
 - **PicartoVod**
 - **Piksel**
@ -1090,6 +1088,8 @@
 - **PodbayFMChannel**
 - **Podchaser**
 - **podomatic**: (**Currently broken**)
+ - **Pokemon**
+ - **PokemonWatch**
 - **PokerGo**: [*pokergo*](## "netrc machine")
 - **PokerGoCollection**: [*pokergo*](## "netrc machine")
 - **PolsatGo**
@ -1160,7 +1160,6 @@
 - **RadioJavan**: (**Currently broken**)
 - **radiokapital**
 - **radiokapital:show**
- - **RadioRadicale**
 - **RadioZetPodcast**
 - **radlive**
 - **radlive:channel**
@ -1368,7 +1367,9 @@
 - **spotify**: Spotify episodes (**Currently broken**)
 - **spotify:show**: Spotify shows (**Currently broken**)
 - **Spreaker**
+ - **SpreakerPage**
 - **SpreakerShow**
+ - **SpreakerShowPage**
 - **SpringboardPlatform**
 - **Sprout**
 - **SproutVideo**
@ -1569,8 +1570,6 @@
 - **UFCTV**: [*ufctv*](## "netrc machine")
 - **ukcolumn**: (**Currently broken**)
 - **UKTVPlay**
- - **UlizaPlayer**
- - **UlizaPortal**: ulizaportal.jp
 - **umg:de**: Universal Music Deutschland (**Currently broken**)
 - **Unistra**
 - **Unity**: (**Currently broken**)
@ -1588,6 +1587,8 @@
 - **Varzesh3**: (**Currently broken**)
 - **Vbox7**
 - **Veo**
+ - **Veoh**
+ - **veoh:user**
 - **Vesti**: Вести.Ru (**Currently broken**)
 - **Vevo**
 - **VevoPlaylist**
--- 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
@ -176,7 +176,7 @@ class CTVNewsIE(InfoExtractor):
                    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}))
+                        {extract_attributes}, 'axis-ids', {json.loads}, ..., 'axisId'))
                ]

        return self.playlist_result(entries, page_id)
--- a/yt_dlp/extractor/digitalconcerthall.py
+++ b/yt_dlp/extractor/digitalconcerthall.py
@ -1,10 +1,7 @@
-import time
-
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
    ExtractorError,
-    jwt_decode_hs256,
    parse_codecs,
    try_get,
    url_or_none,
@ -16,6 +13,9 @@ from ..utils.traversal import traverse_obj
 class DigitalConcertHallIE(InfoExtractor):
    IE_DESC = 'DigitalConcertHall extractor'
    _VALID_URL = r'https?://(?:www\.)?digitalconcerthall\.com/(?P<language>[a-z]+)/(?P<type>film|concert|work)/(?P<id>[0-9]+)-?(?P<part>[0-9]+)?'
+    _OAUTH_URL = 'https://api.digitalconcerthall.com/v2/oauth2/token'
+    _USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15'
+    _ACCESS_TOKEN = None
    _NETRC_MACHINE = 'digitalconcerthall'
    _TESTS = [{
        'note': 'Playlist with only one video',
@ -69,157 +69,59 @@ class DigitalConcertHallIE(InfoExtractor):
        'params': {'skip_download': 'm3u8'},
        'playlist_count': 1,
    }]
-    _LOGIN_HINT = ('Use  --username token --password ACCESS_TOKEN  where ACCESS_TOKEN '
-                   'is the "access_token_production" from your browser local storage')
-    _REFRESH_HINT = 'or else use a "refresh_token" with  --username refresh --password REFRESH_TOKEN'
-    _OAUTH_URL = 'https://api.digitalconcerthall.com/v2/oauth2/token'
-    _CLIENT_ID = 'dch.webapp'
-    _CLIENT_SECRET = '2ySLN+2Fwb'
-    _USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15'
-    _OAUTH_HEADERS = {
-        'Accept': 'application/json',
-        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-        'Origin': 'https://www.digitalconcerthall.com',
-        'Referer': 'https://www.digitalconcerthall.com/',
-        'User-Agent': _USER_AGENT,
-    }
-    _access_token = None
-    _access_token_expiry = 0
-    _refresh_token = None

-    @property
-    def _access_token_is_expired(self):
-        return self._access_token_expiry - 30 <= int(time.time())
-
-    def _set_access_token(self, value):
-        self._access_token = value
-        self._access_token_expiry = traverse_obj(value, ({jwt_decode_hs256}, 'exp', {int})) or 0
-
-    def _cache_tokens(self, /):
-        self.cache.store(self._NETRC_MACHINE, 'tokens', {
-            'access_token': self._access_token,
-            'refresh_token': self._refresh_token,
-        })
-
-    def _fetch_new_tokens(self, invalidate=False):
-        if invalidate:
-            self.report_warning('Access token has been invalidated')
-            self._set_access_token(None)
-
-        if not self._access_token_is_expired:
-            return
-
-        if not self._refresh_token:
-            self._set_access_token(None)
-            self._cache_tokens()
-            raise ExtractorError(
-                'Access token has expired or been invalidated. '
-                'Get a new "access_token_production" value from your browser '
-                f'and try again, {self._REFRESH_HINT}', expected=True)
-
-        # If we only have a refresh token, we need a temporary "initial token" for the refresh flow
-        bearer_token = self._access_token or self._download_json(
-            self._OAUTH_URL, None, 'Obtaining initial token', 'Unable to obtain initial token',
-            data=urlencode_postdata({
+    def _perform_login(self, username, password):
+        login_token = self._download_json(
+            self._OAUTH_URL,
+            None, 'Obtaining token', errnote='Unable to obtain token', data=urlencode_postdata({
                'affiliate': 'none',
                'grant_type': 'device',
                'device_vendor': 'unknown',
-                # device_model 'Safari' gets split streams of 4K/HEVC video and lossless/FLAC audio,
-                # but this is no longer effective since actual login is not possible anymore
-                'device_model': 'unknown',
-                'app_id': self._CLIENT_ID,
+                # device_model 'Safari' gets split streams of 4K/HEVC video and lossless/FLAC audio
+                'device_model': 'unknown' if self._configuration_arg('prefer_combined_hls') else 'Safari',
+                'app_id': 'dch.webapp',
                'app_distributor': 'berlinphil',
-                'app_version': '1.95.0',
-                'client_secret': self._CLIENT_SECRET,
-            }), headers=self._OAUTH_HEADERS)['access_token']
-
+                'app_version': '1.84.0',
+                'client_secret': '2ySLN+2Fwb',
+            }), headers={
+                'Accept': 'application/json',
+                'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+                'User-Agent': self._USER_AGENT,
+            })['access_token']
        try:
-            response = self._download_json(
-                self._OAUTH_URL, None, 'Refreshing token', 'Unable to refresh token',
-                data=urlencode_postdata({
-                    'grant_type': 'refresh_token',
-                    'refresh_token': self._refresh_token,
-                    'client_id': self._CLIENT_ID,
-                    'client_secret': self._CLIENT_SECRET,
+            login_response = self._download_json(
+                self._OAUTH_URL,
+                None, note='Logging in', errnote='Unable to login', data=urlencode_postdata({
+                    'grant_type': 'password',
+                    'username': username,
+                    'password': password,
                }), headers={
-                    **self._OAUTH_HEADERS,
-                    'Authorization': f'Bearer {bearer_token}',
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+                    'Referer': 'https://www.digitalconcerthall.com',
+                    'Authorization': f'Bearer {login_token}',
+                    'User-Agent': self._USER_AGENT,
                })
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                self._set_access_token(None)
-                self._refresh_token = None
-                self._cache_tokens()
-                raise ExtractorError('Your tokens have been invalidated', expected=True)
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 401:
+                raise ExtractorError('Invalid username or password', expected=True)
            raise
-
-        self._set_access_token(response['access_token'])
-        if refresh_token := traverse_obj(response, ('refresh_token', {str})):
-            self.write_debug('New refresh token granted')
-            self._refresh_token = refresh_token
-        self._cache_tokens()
-
-    def _perform_login(self, username, password):
-        self.report_login()
-
-        if username == 'refresh':
-            self._refresh_token = password
-            self._fetch_new_tokens()
-
-        if username == 'token':
-            if not traverse_obj(password, {jwt_decode_hs256}):
-                raise ExtractorError(
-                    f'The access token passed to yt-dlp is not valid. {self._LOGIN_HINT}', expected=True)
-            self._set_access_token(password)
-            self._cache_tokens()
-
-        if username in ('refresh', 'token'):
-            if self.get_param('cachedir') is not False:
-                token_type = 'access' if username == 'token' else 'refresh'
-                self.to_screen(f'Your {token_type} token has been cached to disk. To use the cached '
-                               'token next time, pass  --username cache  along with any password')
-            return
-
-        if username != 'cache':
-            raise ExtractorError(
-                'Login with username and password is no longer supported '
-                f'for this site. {self._LOGIN_HINT}, {self._REFRESH_HINT}', expected=True)
-
-        # Try cached access_token
-        cached_tokens = self.cache.load(self._NETRC_MACHINE, 'tokens', default={})
-        self._set_access_token(cached_tokens.get('access_token'))
-        self._refresh_token = cached_tokens.get('refresh_token')
-        if not self._access_token_is_expired:
-            return
-
-        # Try cached refresh_token
-        self._fetch_new_tokens(invalidate=True)
+        self._ACCESS_TOKEN = login_response['access_token']

    def _real_initialize(self):
-        if not self._access_token:
-            self.raise_login_required(
-                'All content on this site is only available for registered users. '
-                f'{self._LOGIN_HINT}, {self._REFRESH_HINT}', method=None)
+        if not self._ACCESS_TOKEN:
+            self.raise_login_required(method='password')

    def _entries(self, items, language, type_, **kwargs):
        for item in items:
            video_id = item['id']
-
-            for should_retry in (True, False):
-                self._fetch_new_tokens(invalidate=not should_retry)
-                try:
-                    stream_info = self._download_json(
-                        self._proto_relative_url(item['_links']['streams']['href']), video_id, headers={
-                            'Accept': 'application/json',
-                            'Authorization': f'Bearer {self._access_token}',
-                            'Accept-Language': language,
-                            'User-Agent': self._USER_AGENT,
-                        })
-                    break
-                except ExtractorError as error:
-                    if should_retry and isinstance(error.cause, HTTPError) and error.cause.status == 401:
-                        continue
-                    raise
+            stream_info = self._download_json(
+                self._proto_relative_url(item['_links']['streams']['href']), video_id, headers={
+                    'Accept': 'application/json',
+                    'Authorization': f'Bearer {self._ACCESS_TOKEN}',
+                    'Accept-Language': language,
+                    'User-Agent': self._USER_AGENT,
+                })

            formats = []
            for m3u8_url in traverse_obj(stream_info, ('channel', ..., 'stream', ..., 'url', {url_or_none})):
@ -255,6 +157,7 @@ class DigitalConcertHallIE(InfoExtractor):
                'Accept': 'application/json',
                'Accept-Language': language,
                'User-Agent': self._USER_AGENT,
+                'Authorization': f'Bearer {self._ACCESS_TOKEN}',
            })
        videos = [vid_info] if type_ == 'film' else traverse_obj(vid_info, ('_embedded', ..., ...))

--- 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/reddit.py
+++ b/yt_dlp/extractor/reddit.py
@ -259,8 +259,6 @@ class RedditIE(InfoExtractor):
                f'https://www.reddit.com/{slug}/.json', video_id, expected_status=403)
        except ExtractorError as e:
            if isinstance(e.cause, json.JSONDecodeError):
-                if self._get_cookies('https://www.reddit.com/').get('reddit_session'):
-                    raise ExtractorError('Your IP address is unable to access the Reddit API', expected=True)
                self.raise_login_required('Account authentication is required')
            raise

--- 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',
--- a/yt_dlp/version.py
+++ b/yt_dlp/version.py
@ -1,8 +1,8 @@
 # Autogenerated by devscripts/update-version.py

-__version__ = '2024.11.18'
+__version__ = '2024.11.04'

-RELEASE_GIT_HEAD = '7ea2787920cccc6b8ea30791993d114fbd564434'
+RELEASE_GIT_HEAD = '197d0b03b6a3c8fe4fa5ace630eeffec629bf72c'

 VARIANT = None

@ -12,4 +12,4 @@ CHANNEL = 'stable'

 ORIGIN = 'yt-dlp/yt-dlp'

-_pkg_version = '2024.11.18'
+_pkg_version = '2024.11.04'