Merge a9fc46dc7c into f919729538

Created by: bashonly

:ci skip all

CONTRIBUTORS

@@ -695,3 +695,15 @@ KBelmin
 kesor
 MellowKyler
 Wesley107772
+a13ssandr0
+ChocoLZS
+doe1080
+hugovdev
+jshumphrey
+julionc
+manavchaudhary1
+powergold1
+Sakura286
+SamDecrock
+stratus-ss
+subrat-lima

Changelog.md

@@ -4,6 +4,64 @@
 # 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

README.md

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

supportedsites.md

@@ -129,6 +129,8 @@
  - **Bandcamp:album**
  - **Bandcamp:user**
  - **Bandcamp:weekly**
+ - **Bandlab**
+ - **BandlabPlaylist**
  - **BannedVideo**
  - **bbc**: [*bbc*](## "netrc machine") BBC
  - **bbc.co.uk**: [*bbc*](## "netrc machine") BBC iPlayer
@@ -484,6 +486,7 @@
  - **Gab**
  - **GabTV**
  - **Gaia**: [*gaia*](## "netrc machine")
+ - **GameDevTVDashboard**: [*gamedevtv*](## "netrc machine")
  - **GameJolt**
  - **GameJoltCommunity**
  - **GameJoltGame**
@@ -651,6 +654,8 @@
  - **Karaoketv**
  - **Katsomo**: (**Currently broken**)
  - **KelbyOne**: (**Currently broken**)
+ - **Kenh14Playlist**
+ - **Kenh14Video**
  - **Ketnet**
  - **khanacademy**
  - **khanacademy:unit**
@@ -784,10 +789,6 @@
  - **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**
@@ -798,6 +799,7 @@
  - **MiTele**: mitele.es
  - **mixch**
  - **mixch:archive**
+ - **mixch:movie**
  - **mixcloud**
  - **mixcloud:playlist**
  - **mixcloud:user**
@@ -1060,8 +1062,8 @@
  - **PhilharmonieDeParis**: Philharmonie de Paris
  - **phoenix.de**
  - **Photobucket**
+ - **PiaLive**
  - **Piapro**: [*piapro*](## "netrc machine")
- - **PIAULIZAPortal**: ulizaportal.jp - PIA LIVE STREAM
  - **Picarto**
  - **PicartoVod**
  - **Piksel**
@@ -1088,8 +1090,6 @@
  - **PodbayFMChannel**
  - **Podchaser**
  - **podomatic**: (**Currently broken**)
- - **Pokemon**
- - **PokemonWatch**
  - **PokerGo**: [*pokergo*](## "netrc machine")
  - **PokerGoCollection**: [*pokergo*](## "netrc machine")
  - **PolsatGo**
@@ -1160,6 +1160,7 @@
  - **RadioJavan**: (**Currently broken**)
  - **radiokapital**
  - **radiokapital:show**
+ - **RadioRadicale**
  - **RadioZetPodcast**
  - **radlive**
  - **radlive:channel**
@@ -1367,9 +1368,7 @@
  - **spotify**: Spotify episodes (**Currently broken**)
  - **spotify:show**: Spotify shows (**Currently broken**)
  - **Spreaker**
- - **SpreakerPage**
  - **SpreakerShow**
- - **SpreakerShowPage**
  - **SpringboardPlatform**
  - **Sprout**
  - **SproutVideo**
@@ -1570,6 +1569,8 @@
  - **UFCTV**: [*ufctv*](## "netrc machine")
  - **ukcolumn**: (**Currently broken**)
  - **UKTVPlay**
+ - **UlizaPlayer**
+ - **UlizaPortal**: ulizaportal.jp
  - **umg:de**: Universal Music Deutschland (**Currently broken**)
  - **Unistra**
  - **Unity**: (**Currently broken**)
@@ -1587,8 +1588,6 @@
  - **Varzesh3**: (**Currently broken**)
  - **Vbox7**
  - **Veo**
- - **Veoh**
- - **veoh:user**
  - **Vesti**: Вести.Ru (**Currently broken**)
  - **Vevo**
  - **VevoPlaylist**

yt_dlp/extractor/digitalconcerthall.py

@@ -1,7 +1,10 @@
+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,
@@ -13,9 +16,6 @@ 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,59 +69,157 @@ 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
 
-    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({
+    @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({
                 'affiliate': 'none',
                 'grant_type': 'device',
                 'device_vendor': 'unknown',
-                # 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',
+                # 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,
                 'app_distributor': 'berlinphil',
-                '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']
+                'app_version': '1.95.0',
+                'client_secret': self._CLIENT_SECRET,
+            }), headers=self._OAUTH_HEADERS)['access_token']
+
         try:
-            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,
+            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,
                 }), headers={
-                    '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,
+                    **self._OAUTH_HEADERS,
+                    'Authorization': f'Bearer {bearer_token}',
                 })
-        except ExtractorError as error:
-            if isinstance(error.cause, HTTPError) and error.cause.status == 401:
-                raise ExtractorError('Invalid username or password', expected=True)
+        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)
             raise
-        self._ACCESS_TOKEN = login_response['access_token']
+
+        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)
 
     def _real_initialize(self):
-        if not self._ACCESS_TOKEN:
-            self.raise_login_required(method='password')
+        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)
 
     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}',
+                            '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
 
             formats = []
             for m3u8_url in traverse_obj(stream_info, ('channel', ..., 'stream', ..., 'url', {url_or_none})):
@@ -157,7 +255,6 @@ 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', ..., ...))
 

yt_dlp/extractor/reddit.py

@@ -259,6 +259,8 @@ 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
 

yt_dlp/extractor/rts.py

@@ -1,182 +1,290 @@
-import re
+import functools
 
 from .srgssr import SRGSSRIE
 from ..utils import (
     determine_ext,
     int_or_none,
-    parse_duration,
+    orderedSet,
     parse_iso8601,
-    unescapeHTML,
-    urljoin,
+    parse_resolution,
 )
+from ..utils.traversal import traverse_obj
 
 
-class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
-    _WORKING = False
+class RTSIE(SRGSSRIE):
+    _GEO_COUNTRIES = ['CH']
     IE_DESC = 'RTS.ch'
-    _VALID_URL = r'rts:(?P<rts_id>\d+)|https?://(?:.+?\.)?rts\.ch/(?:[^/]+/){2,}(?P<id>[0-9]+)-(?P<display_id>.+?)\.html'
+    _VALID_URL = [
+        r'rts:(?P<id>\d+)',
+        r'https?://(?:.+?\.)?rts\.ch/(?:[^/]+/){2,}(?P<id>[0-9]+)-(?P<display_id>.+?)\.html',
+        r'https?://(?:.+?\.)?rts\.ch/(?:[^/]+/){2,}(?P<display_id>.+?)-(?P<id>[0-9]+)\.html',
+    ]
 
     _TESTS = [
         {
+            # article with videos
             'url': 'http://www.rts.ch/archives/tv/divers/3449373-les-enfants-terribles.html',
-            'md5': '753b877968ad8afaeddccc374d4256a5',
             'info_dict': {
                 'id': '3449373',
-                'display_id': 'les-enfants-terribles',
-                'ext': 'mp4',
-                'duration': 1488,
                 'title': 'Les Enfants Terribles',
                 'description': 'France Pommier et sa soeur Luce Feral, les deux filles de ce groupe de 5.',
-                'uploader': 'Divers',
+                'display_id': 'les-enfants-terribles',
+                'tags': ['Divers', 'Archives TV', 'Culture et Arts', 'Les archives', 'Personnalités', 'RTS Archives', 'Années 1960', 'Autres arts', 'Décennies', 'Société'],
+            },
+            'playlist': [{
+                'info_dict': {
+                    'id': '3449373',
+                    'ext': 'mp4',
+                    'title': 'Les Enfants Terribles',
+                    'description': 'France Pommier et sa soeur Luce Feral, les deux filles de ce groupe de 5.',
+                    'thumbnail': r're:^https?://.*\.image',
                     'upload_date': '19680921',
                     'timestamp': -40280400,
-                'thumbnail': r're:^https?://.*\.image',
-                'view_count': int,
+                    'duration': 1488,
+                    'categories': ['Divers'],
                 },
-            'expected_warnings': ['Unable to download f4m manifest', 'Failed to download m3u8 information'],
-        },
-        {
-            'url': 'http://www.rts.ch/emissions/passe-moi-les-jumelles/5624067-entre-ciel-et-mer.html',
-            'info_dict': {
-                'id': '5624065',
-                'title': 'Passe-moi les jumelles',
-            },
-            'playlist_mincount': 4,
+            }],
+            'params': {'skip_download': 'm3u8'},  # 700-byte first fragment
         },
         {
+            # video without text content
             'url': 'http://www.rts.ch/video/sport/hockey/5745975-1-2-kloten-fribourg-5-2-second-but-pour-gotteron-par-kwiatowski.html',
             'info_dict': {
                 'id': '5745975',
                 'display_id': '1-2-kloten-fribourg-5-2-second-but-pour-gotteron-par-kwiatowski',
-                'ext': 'mp4',
-                'duration': 48,
                 'title': '1/2, Kloten - Fribourg (5-2): second but pour Gottéron par Kwiatowski',
                 'description': 'Hockey - Playoff',
-                'uploader': 'Hockey',
+                'tags': ['Hockey', 'Sport', 'RTS Sport'],
+            },
+            'playlist': [{
+                'info_dict': {
+                    'id': '5745975',
+                    'ext': 'mp4',
+                    'title': '1/2, Kloten - Fribourg (5-2): second but pour Gottéron par Kwiatowski',
+                    'description': 'Hockey - Playoff',
+                    'thumbnail': r're:^https?://.*\.image',
                     'upload_date': '20140403',
                     'timestamp': 1396556882,
-                'thumbnail': r're:^https?://.*\.image',
-                'view_count': int,
+                    'duration': 48,
+                    'categories': ['Hockey sur glace'],
                 },
-            'params': {
-                # m3u8 download
-                'skip_download': True,
-            },
-            'expected_warnings': ['Unable to download f4m manifest', 'Failed to download m3u8 information'],
+            }],
+            'params': {'skip_download': 'm3u8'},  # 700-byte first fragment
             'skip': 'Blocked outside Switzerland',
         },
         {
+            # video player; redirection: https://www.rts.ch/play/tv/lactu-en-video/video/londres-cachee-par-un-epais-smog?urn=urn:rts:video:5745356
             'url': 'http://www.rts.ch/video/info/journal-continu/5745356-londres-cachee-par-un-epais-smog.html',
-            'md5': '9bb06503773c07ce83d3cbd793cebb91',
             'info_dict': {
                 'id': '5745356',
-                'display_id': 'londres-cachee-par-un-epais-smog',
                 'ext': 'mp4',
-                'duration': 33,
+                'duration': 33.76,
                 'title': 'Londres cachée par un épais smog',
                 'description': 'Un important voile de smog recouvre Londres depuis mercredi, provoqué par la pollution et du sable du Sahara.',
-                'uploader': 'L\'actu en vidéo',
                 'upload_date': '20140403',
                 'timestamp': 1396537322,
                 'thumbnail': r're:^https?://.*\.image',
-                'view_count': int,
+                'webpage_url': 'srgssr:rts:video:5745356',
             },
-            'expected_warnings': ['Unable to download f4m manifest', 'Failed to download m3u8 information'],
+            'params': {'skip_download': 'm3u8'},  # 700-byte first fragment
         },
         {
+            # audio & podcast
             'url': 'http://www.rts.ch/audio/couleur3/programmes/la-belle-video-de-stephane-laurenceau/5706148-urban-hippie-de-damien-krisl-03-04-2014.html',
-            'md5': 'dd8ef6a22dff163d063e2a52bc8adcae',
             'info_dict': {
                 'id': '5706148',
-                'display_id': 'urban-hippie-de-damien-krisl-03-04-2014',
-                'ext': 'mp3',
-                'duration': 123,
                 'title': '"Urban Hippie", de Damien Krisl',
                 'description': 'Des Hippies super glam.',
-                'upload_date': '20140403',
-                'timestamp': 1396551600,
+                'display_id': 'urban-hippie-de-damien-krisl',
+                'tags': ['Media Radio', 'Couleur3'],
             },
+            'playlist': [{
+                'info_dict': {
+                    'id': '5706148',
+                    'ext': 'mp3',
+                    'title': '"Urban Hippie", de Damien Krisl',
+                    'description': 'Des Hippies super glam.',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'upload_date': '20140403',
+                    'timestamp': 1396546481,
+                    'duration': 123,
+                    'categories': ['La belle vidéo de Stéphane Laurenceau'],
+                },
+            }, {
+                'info_dict': {
+                    'id': '5747185',
+                    'ext': 'mp3',
+                    'title': 'Le musée du psychédélisme',
+                    'description': 'md5:72f8662f48c32050ae817e3bde7e0acc',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'upload_date': '20140402',
+                    'timestamp': 1396476000,
+                    'duration': 274,
+                    'categories': ['Happy Culture'],
+                },
+            }, {
+                'info_dict': {
+                    'id': '5706149',
+                    'ext': 'mp3',
+                    'title': 'Silk Art Hippie Culture',
+                    'description': 'md5:8e3b9d8d84d85ca8a1905cf50b39bba4',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'upload_date': '20140403',
+                    'timestamp': 1396545649,
+                    'duration': 161,
+                    'categories': ['Happy Pics'],
+                },
+            }, {
+                'info_dict': {
+                    'id': '5706148',
+                    'ext': 'mp3',
+                    'title': '"Urban Hippie", de Damien Krisl',
+                    'description': 'Des Hippies super glam.',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'upload_date': '20140403',
+                    'timestamp': 1396546481,
+                    'duration': 123,
+                    'categories': ['La belle vidéo de Stéphane Laurenceau'],
+                },
+            }],
         },
         {
             # article with videos on rhs
             'url': 'http://www.rts.ch/sport/hockey/6693917-hockey-davos-decroche-son-31e-titre-de-champion-de-suisse.html',
             'info_dict': {
                 'id': '6693917',
-                'title': 'Hockey: Davos décroche son 31e titre de champion de Suisse',
+                'title': 'Davos décroche le 31e titre de son histoire',
+                'description': 'md5:3c9a767b2a332413eda33c526024578c',
+                'display_id': 'hockey-davos-decroche-son-31e-titre-de-champion-de-suisse',
+                'tags': ['Hockey', 'Tout le sport', 'RTS Info', 'LNA', "Toute l'info", 'RTS Sport'],
             },
             'playlist_mincount': 5,
+            'skip': 'Blocked outside Switzerland',
+        },
+        {
+            # articles containing recordings of TV shows
+            'url': 'https://www.rts.ch/info/regions/valais/12865814-un-bouquetin-emporte-par-un-aigle-royal-sur-les-hauts-de-fully-vs.html',
+            'info_dict': {
+                'id': '12865814',
+                'title': 'Un bouquetin emporté par un aigle royal sur les hauts de Fully (VS)',
+                'description': 'md5:9b511f89075e2730bd2dd59915c25574',
+                'display_id': 'un-bouquetin-emporte-par-un-aigle-royal-sur-les-hauts-de-fully-vs',
+                'tags': ['Régions', 'RTS Info', 'Valais', "Toute l'info"],
+            },
+            'playlist': [{
+                'info_dict': {
+                    'id': '12861415',
+                    'ext': 'mp4',
+                    'title': 'En Valais, un bouquetin emporté dans les airs par un aigle royal. Décryptage d’une image rare.',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'timestamp': 1644690600,
+                    'upload_date': '20220212',
+                    'duration': 107,
+                    'categories': ['19h30'],
+                },
+            }],
+            'params': {'skip_download': 'm3u8'},  # 700-byte first fragment
+            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
+        },
+        {
+            # new URL format; article with videos
+            'url': 'https://www.rts.ch/info/suisse/2024/article/doris-leuthard-il-y-a-des-alternatives-au-nucleaire-qui-sont-moins-risquees-28631869.html',
+            'info_dict': {
+                'id': '28631869',
+                'title': 'Doris Leuthard: "Il y a des alternatives au nucléaire qui sont moins risquées"',
+                'description': 'md5:ba9930e218dcd177801a34b89a16b86e',
+                'display_id': 'doris-leuthard-il-y-a-des-alternatives-au-nucleaire-qui-sont-moins-risquees',
+                'tags': 'count:13',
+            },
+            'playlist': [{
+                'info_dict': {
+                    'id': '15162786',
+                    'ext': 'mp4',
+                    'title': 'L\'invitée de La Matinale (vidéo) - Doris Leuthard, co-présidente du projet d\'exposition nationale Svizra27',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'upload_date': '20240916',
+                    'timestamp': 1726462800,
+                    'duration': 860,
+                    'categories': ['La Matinale'],
+                },
+            }, {
+                'info_dict': {
+                    'id': '15164848',
+                    'ext': 'mp4',
+                    'title': 'Le Centre pourrait faire pencher la balance en faveur de la construction de nouvelles centrales nucléaires',
+                    'thumbnail': r're:^https?://.*\.image',
+                    'upload_date': '20240916',
+                    'timestamp': 1726502400,
+                    'duration': 227,
+                    'categories': ['Forum'],
+                },
+            }],
+            'params': {'skip_download': 'm3u8'},  # 700-byte first fragment
+            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
         },
         {
             'url': 'http://pages.rts.ch/emissions/passe-moi-les-jumelles/5624065-entre-ciel-et-mer.html',
             'only_matching': True,
         },
+        {
+            'url': 'http://www.rts.ch/emissions/passe-moi-les-jumelles/5624067-entre-ciel-et-mer.html',
+            'only_matching': True,
+        },
     ]
 
     def _real_extract(self, url):
-        m = self._match_valid_url(url)
-        media_id = m.group('rts_id') or m.group('id')
-        display_id = m.group('display_id') or media_id
+        webpage, urlh = self._download_webpage_handle(url, self._match_id(url))
+        if urlh.url != url:
+            return self.url_result(urlh.url)
 
-        def download_json(internal_id):
-            return self._download_json(
-                f'http://www.rts.ch/a/{internal_id}.html?f=json/article',
-                display_id)
+        mobj = self._match_valid_url(url)
+        display_id = traverse_obj(mobj, 'display_id', default=mobj.group('id')) or mobj.group('id')
 
-        all_info = download_json(media_id)
+        media_list = []
+        article_details = self._search_json(r'articleDetails\s*=\s*', webpage, 'article details', display_id)
+        traverse_obj(article_details, ('mainMedia', filter, {media_list.append}))
+        traverse_obj(article_details, ('innerMediaElements', filter, {media_list.extend}))
+        traverse_obj(article_details, ('mediaElements', filter, {media_list.extend}))
+        media_list = orderedSet(media_list)
 
-        # media_id extracted out of URL is not always a real id
-        if 'video' not in all_info and 'audio' not in all_info:
         entries = []
+        for media in media_list:
+            media_id = media['oid']
+            media_info = self._get_media_data('rts', media['type'], media_id)
 
-            for item in all_info.get('items', []):
-                item_url = item.get('url')
-                if not item_url:
-                    continue
-                entries.append(self.url_result(item_url, 'RTS'))
+            if fmts := self._extract_formats(media_info, media_id):
+                entries.append({
+                    'id': media_info['id'],
+                    'title': media_info['title'],
+                    'formats': fmts,
+                    'description': media_info.get('description'),
+                    'thumbnails': [traverse_obj(media_info, ('imageUrl', {lambda x: {
+                        'url': x,
+                        **parse_resolution(x),
+                    }}))],
+                    'timestamp': parse_iso8601(media_info.get('date')),
+                    'duration': traverse_obj(media_info, ('duration', {functools.partial(int_or_none, scale=1000)})),
+                    'categories': [media.get('category')],
+                })
 
-            if not entries:
-                page, urlh = self._download_webpage_handle(url, display_id)
-                if re.match(self._VALID_URL, urlh.url).group('id') != media_id:
-                    return self.url_result(urlh.url, 'RTS')
-
-                # article with videos on rhs
-                videos = re.findall(
-                    r'<article[^>]+class="content-item"[^>]*>\s*<a[^>]+data-video-urn="urn:([^"]+)"',
-                    page)
-                if not videos:
-                    videos = re.findall(
-                        r'(?s)<iframe[^>]+class="srg-player"[^>]+src="[^"]+urn:([^"]+)"',
-                        page)
-                if videos:
-                    entries = [self.url_result(f'srgssr:{video_urn}', 'SRGSSR') for video_urn in videos]
-
-            if entries:
-                return self.playlist_result(entries, media_id, all_info.get('title'))
-
-            internal_id = self._html_search_regex(
-                r'<(?:video|audio) data-id="([0-9]+)"', page,
-                'internal video id')
-            all_info = download_json(internal_id)
-
-        media_type = 'video' if 'video' in all_info else 'audio'
-
-        # check for errors
-        self._get_media_data('rts', media_type, media_id)
-
-        info = all_info['video']['JSONinfo'] if 'video' in all_info else all_info['audio']
-
-        title = info['title']
+        return self.playlist_result(
+            entries, article_details.get('oid'), article_details.get('title'),
+            article_details.get('lead'), display_id=display_id,
+            tags=traverse_obj(article_details, ('tags', ..., 'name')))
 
+    def _extract_formats(self, media_info, media_id):
         def extract_bitrate(url):
             return int_or_none(self._search_regex(
                 r'-([0-9]+)k\.', url, 'bitrate', default=None))
 
         formats = []
-        streams = info.get('streams', {})
-        for format_id, format_url in streams.items():
-            if format_id == 'hds_sd' and 'hds' in streams:
+        for idx, stream in enumerate(traverse_obj(
+                media_info, ('resourceList', lambda _, v: v['url']))):
+            format_id = stream.get('protocol') or str(idx)
+            format_url = stream['url']
+            if format_id == 'hds_sd' and 'hds' in stream:
                 continue
-            if format_id == 'hls_sd' and 'hls' in streams:
+            if format_id == 'hls_sd' and 'hls' in stream:
                 continue
             ext = determine_ext(format_url)
             if ext in ('m3u8', 'f4m'):
@@ -195,37 +303,5 @@ class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
                     'tbr': extract_bitrate(format_url),
                 })
 
-        download_base = 'http://rtsww{}-d.rts.ch/'.format('-a' if media_type == 'audio' else '')
-        for media in info.get('media', []):
-            media_url = media.get('url')
-            if not media_url or re.match(r'https?://', media_url):
-                continue
-            rate = media.get('rate')
-            ext = media.get('ext') or determine_ext(media_url, 'mp4')
-            format_id = ext
-            if rate:
-                format_id += '-%dk' % rate
-            formats.append({
-                'format_id': format_id,
-                'url': urljoin(download_base, media_url),
-                'tbr': rate or extract_bitrate(media_url),
-            })
-
         self._check_formats(formats, media_id)
-
-        duration = info.get('duration') or info.get('cutout') or info.get('cutduration')
-        if isinstance(duration, str):
-            duration = parse_duration(duration)
-
-        return {
-            'id': media_id,
-            'display_id': display_id,
-            'formats': formats,
-            'title': title,
-            'description': info.get('intro'),
-            'duration': duration,
-            'view_count': int_or_none(info.get('plays')),
-            'uploader': info.get('programName'),
-            'timestamp': parse_iso8601(info.get('broadcast_date')),
-            'thumbnail': unescapeHTML(info.get('preview_image_url')),
-        }
+        return formats

yt_dlp/extractor/srgssr.py

@@ -57,7 +57,7 @@ class SRGSSRIE(InfoExtractor):
     def _get_media_data(self, bu, media_type, media_id):
         query = {'onlyChapters': True} if media_type == 'video' else {}
         full_media_data = self._download_json(
-            f'https://il.srgssr.ch/integrationlayer/2.0/{bu}/mediaComposition/{media_type}/{media_id}.json',
+            f'https://il.srgssr.ch/integrationlayer/2.0/mediaComposition/byUrn/urn:{bu}:{media_type}:{media_id}.json',
             media_id, query=query)['chapterList']
         try:
             media_data = next(
@@ -165,7 +165,7 @@ class SRGSSRPlayIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'http://www.srf.ch/play/tv/10vor10/video/snowden-beantragt-asyl-in-russland?id=28e1a57d-5b76-4399-8ab3-9097f071e6c5',
-        'md5': '6db2226ba97f62ad42ce09783680046c',
+        'md5': '81c6ad90d774c46e3c54ea2f01a94db3',
         'info_dict': {
             'id': '28e1a57d-5b76-4399-8ab3-9097f071e6c5',
             'ext': 'mp4',
@@ -173,7 +173,7 @@ class SRGSSRPlayIE(InfoExtractor):
             'title': 'Snowden beantragt Asyl in Russland',
             'timestamp': 1372708215,
             'duration': 113.827,
-            'thumbnail': r're:^https?://.*1383719781\.png$',
+            'thumbnail': r're:^https?://download-media\.srf\.ch/.*\.(?:png|jpg)$',
         },
         'expected_warnings': ['Unable to download f4m manifest'],
     }, {
@@ -185,6 +185,7 @@ class SRGSSRPlayIE(InfoExtractor):
             'title': 'Saira: Tujetsch - tuttina cuntinuar cun Sedrun Mustér Turissem',
             'timestamp': 1444709160,
             'duration': 336.816,
+            'thumbnail': r're:^https?://download-media\.srf\.ch/.*\.(?:png|jpg)$',
         },
         'params': {
             # rtmp download
@@ -217,7 +218,7 @@ class SRGSSRPlayIE(InfoExtractor):
             'duration': 94.0,
             'upload_date': '20170215',
             'timestamp': 1487173560,
-            'thumbnail': r're:https?://www\.swissinfo\.ch/srgscalableimage/42961964',
+            'thumbnail': r're:https?://cdn\.prod\.swi-services\.ch/.+',
             'subtitles': 'count:9',
         },
         'params': {

yt_dlp/version.py

@@ -1,8 +1,8 @@
 # Autogenerated by devscripts/update-version.py
 
-__version__ = '2024.11.04'
+__version__ = '2024.11.18'
 
-RELEASE_GIT_HEAD = '197d0b03b6a3c8fe4fa5ace630eeffec629bf72c'
+RELEASE_GIT_HEAD = '7ea2787920cccc6b8ea30791993d114fbd564434'
 
 VARIANT = None
 
@@ -12,4 +12,4 @@ CHANNEL = 'stable'
 
 ORIGIN = 'yt-dlp/yt-dlp'
 
-_pkg_version = '2024.11.04'
+_pkg_version = '2024.11.18'