Merge fca99e1433 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/_extractors.py

@@ -1849,6 +1849,11 @@ from .shahid import (
 from .sharepoint import SharePointIE
 from .sharevideos import ShareVideosEmbedIE
 from .shemaroome import ShemarooMeIE
+from .shouttv import (
+    ShoutTVIE,
+    ShoutTVSeasonIE,
+    ShoutTVSeriesIE,
+)
 from .showroomlive import ShowRoomLiveIE
 from .sibnet import SibnetEmbedIE
 from .simplecast import (

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):
+    @property
-        login_token = self._download_json(
+    def _access_token_is_expired(self):
-            self._OAUTH_URL,
+        return self._access_token_expiry - 30 <= int(time.time())
-            None, 'Obtaining token', errnote='Unable to obtain token', data=urlencode_postdata({
+
+    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 'Safari' gets split streams of 4K/HEVC video and lossless/FLAC audio,
-                'device_model': 'unknown' if self._configuration_arg('prefer_combined_hls') else 'Safari',
+                # but this is no longer effective since actual login is not possible anymore
-                'app_id': 'dch.webapp',
+                'device_model': 'unknown',
+                'app_id': self._CLIENT_ID,
                 'app_distributor': 'berlinphil',
-                'app_version': '1.84.0',
+                'app_version': '1.95.0',
-                'client_secret': '2ySLN+2Fwb',
+                'client_secret': self._CLIENT_SECRET,
-            }), headers={
+            }), headers=self._OAUTH_HEADERS)['access_token']
-                'Accept': 'application/json',
+
-                'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-                'User-Agent': self._USER_AGENT,
-            })['access_token']
         try:
-            login_response = self._download_json(
+            response = self._download_json(
-                self._OAUTH_URL,
+                self._OAUTH_URL, None, 'Refreshing token', 'Unable to refresh token',
-                None, note='Logging in', errnote='Unable to login', data=urlencode_postdata({
+                data=urlencode_postdata({
-                    'grant_type': 'password',
+                    'grant_type': 'refresh_token',
-                    'username': username,
+                    'refresh_token': self._refresh_token,
-                    'password': password,
+                    'client_id': self._CLIENT_ID,
+                    'client_secret': self._CLIENT_SECRET,
                 }), headers={
-                    'Accept': 'application/json',
+                    **self._OAUTH_HEADERS,
-                    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+                    'Authorization': f'Bearer {bearer_token}',
-                    'Referer': 'https://www.digitalconcerthall.com',
-                    'Authorization': f'Bearer {login_token}',
-                    'User-Agent': self._USER_AGENT,
                 })
-        except ExtractorError as error:
+        except ExtractorError as e:
-            if isinstance(error.cause, HTTPError) and error.cause.status == 401:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                raise ExtractorError('Invalid username or password', expected=True)
+                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:
+        if not self._access_token:
-            self.raise_login_required(method='password')
+            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']
-            stream_info = self._download_json(
+
-                self._proto_relative_url(item['_links']['streams']['href']), video_id, headers={
+            for should_retry in (True, False):
-                    'Accept': 'application/json',
+                self._fetch_new_tokens(invalidate=not should_retry)
-                    'Authorization': f'Bearer {self._ACCESS_TOKEN}',
+                try:
-                    'Accept-Language': language,
+                    stream_info = self._download_json(
-                    'User-Agent': self._USER_AGENT,
+                        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
 
             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/shouttv.py

@@ -0,0 +1,352 @@
+import itertools
+import json
+import re
+import time
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    filter_dict,
+    int_or_none,
+    jwt_decode_hs256,
+    parse_age_limit,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class ShoutTVBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'shouttv'
+    _API_BASE_URL = 'https://dce-frontoffice.imggaming.com/api'
+    # version and key taken from https://watch.shout-tv.com/code/js/app.3b4ef510d0048f672e1d.js
+    _APP_VERSION = '6.57.10.65bab8b'  # 'OUTPUT_FOLDER' in JS
+    _API_KEY = '857a1e5d-e35e-4fdf-805b-a87b6f8364bf'  # 'API_KEY' in JS
+    _API_REALM = 'dce.shout'
+    _API_HEADERS = {
+        'Accept': 'application/json',
+        'Origin': 'https://watch.shout-tv.com',
+        'Referer': 'https://watch.shout-tv.com/',
+        'app': 'dice',
+        'x-api-key': _API_KEY,
+        'x-app-var': _APP_VERSION,
+    }
+    _ACCESS_TOKEN = None
+    _ACCESS_EXPIRY = 0
+    _REFRESH_TOKEN = None
+    _is_logged_in = False
+
+    def _set_tokens(self, auth_data):
+        ShoutTVBaseIE._ACCESS_TOKEN = auth_data['authorisationToken']  # 10 minute TTL
+        ShoutTVBaseIE._ACCESS_EXPIRY = jwt_decode_hs256(ShoutTVBaseIE._ACCESS_TOKEN)['exp']
+        if refresh_token := traverse_obj(auth_data, ('refreshToken', {str})):
+            self.write_debug('New refresh token granted')
+            ShoutTVBaseIE._REFRESH_TOKEN = refresh_token  # 2 month TTL
+        username, _ = self._get_login_info()
+        if username and ShoutTVBaseIE._is_logged_in:
+            tokens = self.cache.load(self._NETRC_MACHINE, 'tokens', default={})
+            tokens[username] = [ShoutTVBaseIE._ACCESS_TOKEN, ShoutTVBaseIE._REFRESH_TOKEN]
+            self.cache.store(self._NETRC_MACHINE, 'tokens', tokens)
+
+    def _fetch_access_token(self, content_id=None):
+        if ShoutTVBaseIE._ACCESS_TOKEN and ShoutTVBaseIE._ACCESS_EXPIRY - 10 > time.time():
+            return
+
+        headers = self._API_HEADERS.copy()
+        if ShoutTVBaseIE._REFRESH_TOKEN and ShoutTVBaseIE._ACCESS_TOKEN:
+            headers.update({
+                'Authorization': f'Mixed {ShoutTVBaseIE._ACCESS_TOKEN} {ShoutTVBaseIE._REFRESH_TOKEN}',
+                'Realm': self._API_REALM,
+            })
+        self._set_tokens(self._download_json(
+            f'{self._API_BASE_URL}/v1/init/', content_id,
+            'Fetching access token', 'Unable to fetch token',
+            headers=headers, query={
+                'lk': 'language',
+                'pk': ['subTitleLanguage', 'audioLanguage', 'autoAdvance', 'pluginAccessTokens'],
+                'readLicences': 'true',
+                'countEvents': 'LIVE',
+                'menuTargetPlatform': 'WEB',
+            })['authentication'])
+
+    def _perform_login(self, username, password):
+        self.report_login()
+        cached_tokens = self.cache.load(self._NETRC_MACHINE, 'tokens', default={}).get(username) or []
+        if (len(cached_tokens) == 2) and (jwt_decode_hs256(cached_tokens[1])['exp'] - 60 > time.time()):
+            ShoutTVBaseIE._ACCESS_TOKEN, ShoutTVBaseIE._REFRESH_TOKEN = cached_tokens
+            ShoutTVBaseIE._is_logged_in = True
+            self.write_debug('Cached refresh token is still valid')
+            return
+
+        self._fetch_access_token()
+        try:
+            login_data = self._download_json(
+                f'{self._API_BASE_URL}/v2/login', None, 'Submitting credentials',
+                'Unable to log in', headers={
+                    **self._API_HEADERS,
+                    'Authorization': f'Bearer {ShoutTVBaseIE._ACCESS_TOKEN}',
+                    'Content-Type': 'application/json',
+                    'Realm': self._API_REALM,
+                }, data=json.dumps({
+                    'id': username,
+                    'secret': password,
+                }, separators=(',', ':')).encode())
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 404:
+                raise ExtractorError('Invalid username or password', expected=True)
+            raise
+        ShoutTVBaseIE._is_logged_in = True
+        self._set_tokens(login_data)
+
+    def _call_api(self, content_id, content_type, note='API JSON', query=None, headers=None):
+        endpoint = {
+            'video': 'vod',
+            'live': 'event',
+        }.get(content_type, content_type)
+        self._fetch_access_token(content_id)
+        return self._download_json(
+            f'{self._API_BASE_URL}/v4/{endpoint}/{content_id}', content_id,
+            f'Downloading {note}', f'Unable to download {note}', query=query,
+            headers={
+                **self._API_HEADERS,
+                'Authorization': f'Bearer {ShoutTVBaseIE._ACCESS_TOKEN}',
+                **(headers or {}),
+                'Realm': self._API_REALM,
+            })
+
+    @staticmethod
+    def _parse_details(details):
+        return traverse_obj(details, {
+            'id': ('id', {int}, {str_or_none}),
+            'title': ('title', {str}),
+            'description': ('description', {str}),
+            'duration': ('duration', {int_or_none}),
+            'categories': ('categories', ..., {str}, filter),
+            'thumbnails': (('thumbnailUrl', 'posterUrl', 'coverUrl'), {'url': {url_or_none}}),
+            'age_limit': (('rating', 'contentRating'), 'rating', {parse_age_limit}, any),
+            'episode_number': ('episodeInformation', 'episodeNumber', {int_or_none}),
+            'season_number': ('episodeInformation', 'seasonNumber', {int_or_none}),
+            'season_id': ('episodeInformation', 'season', {int}, {str_or_none}),
+            'season': ('episodeInformation', 'seasonTitle', {str}),
+            'series_id': ('episodeInformation', 'seriesInformation', 'id', {int}, {str_or_none}),
+            'series': ('episodeInformation', 'seriesInformation', 'title', {str}),
+        })
+
+    def _extract_vod_formats_and_subtitles(self, player, video_id):
+        formats, subtitles = [], {}
+        # XXX: 'subtitles' array fields are alongside the 'url' fields in both 'hls and 'dash',
+        #      but couldn't find any examples where the arrays were not empty
+        for idx, m3u8_url in enumerate(traverse_obj(player, ('hls', ..., 'url', {url_or_none})), start=1):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                m3u8_url, video_id, 'mp4', m3u8_id=f'hls-{idx}', fatal=False)
+            # This site's HLS manifests do not provide any audio codec/bitrate info
+            # The audio formats are given a GROUP-ID to pair them to video formats w/the same GROUP-ID
+            # Worst quality audio is paired to worst quality video, ba paired to bv, etc
+            # 'audio-1' is usually the worst quality and 'audio-3' is usually the best quality
+            for fmt in fmts:
+                if mobj := re.search(r'-audio-(?P<quality>\d+)', fmt['format_id']):
+                    fmt['quality'] = int(mobj.group('quality'))
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        for idx, mpd_url in enumerate(traverse_obj(player, ('dash', ..., 'url', {url_or_none})), start=1):
+            fmts, subs = self._extract_mpd_formats_and_subtitles(
+                mpd_url, video_id, mpd_id=f'dash-{idx}', fatal=False)
+            # DASH audio formats will always be sorted below HLS unless we also set 'quality'
+            for q, fmt in enumerate(sorted(traverse_obj(fmts, (
+                    lambda _, v: v['tbr'] and v['vcodec'] == 'none')), key=lambda x: x['tbr'])):
+                fmt['quality'] = q
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        return formats, subtitles
+
+
+class ShoutTVIE(ShoutTVBaseIE):
+    IE_NAME = 'shouttv'
+    IE_DESC = 'Shout! TV video-on-demand on live channels'
+    _VALID_URL = r'https?://watch\.shout-tv\.com/(?P<type>video|live)/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://watch.shout-tv.com/video/640292',
+        'info_dict': {
+            'id': '640292',
+            'ext': 'mp4',
+            'title': 'Pee-wee\'s Playhouse Christmas Special',
+            'description': 'Pee-Wee Herman throws a Christmas party at his playhouse with his friends and some celebrity guests.',
+            'duration': 2879,
+            'thumbnail': 'https://dve-images.imggaming.com/original/p/2024/05/30/HE2kpg3EjcjrQJb2dSctUVhzpyz7rCXn-1717027231485.jpg',
+            'age_limit': 0,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://watch.shout-tv.com/video/691416?seasonId=26337',
+        'info_dict': {
+            'id': '691416',
+            'ext': 'mp4',
+            'title': 'The Commish: S1 E1 - In The Best Of Families',
+            'description': 'md5:d61403fb8ddaaeb1100228ac146f5a0c',
+            'episode': 'Episode 0',
+            'episode_number': 0,
+            'season': 'The Commish: Season 1',
+            'season_number': 1,
+            'season_id': '26337',
+            'series': 'The Commish',
+            'series_id': '2695',
+            'duration': 2785,
+            'thumbnail': 'https://dve-images.imggaming.com/original/p/2024/09/23/wgpGQ1Vr3DPG6sHnmbGpsKZqMkcosJND-1727130957509.jpg',
+            'age_limit': 14,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://watch.shout-tv.com/live/265692',
+        'info_dict': {
+            'id': '265692',
+            'ext': 'mp4',
+            'title': r're:MST3K \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+            'live_status': 'is_live',
+            'thumbnail': 'https://img.dge-prod.dicelaboratory.com/thumbnails/265692/original/latest.jpg',
+        },
+        'params': {'skip_download': 'livestream'},
+    }]
+
+    def _real_extract(self, url):
+        video_id, video_type = self._match_valid_url(url).group('id', 'type')
+        details = self._call_api(
+            video_id, video_type, query={'includePlaybackDetails': 'URL'},
+            headers={
+                'CM-APP-NAME': 'Website',
+                'CM-APP-VERSION': self._APP_VERSION,
+                'CM-CST-TCF': '',
+                'CM-CST-USP': '',
+                'CM-DVC-DNT': '1',
+                'CM-DVC-H': '1080',
+                'CM-DVC-LANG': 'en-US',
+                'CM-DVC-OS': '14',
+                'CM-DVC-TYPE': '2',
+                'CM-DVC-W': '1920',
+                'CM-WEB-MBL': '0',
+                'CM-WEB-PAGE': f'/{video_type}/{video_id}',
+            })
+
+        access_level = traverse_obj(details, ('accessLevel', {str}))
+        if access_level == 'GRANTED_ON_SIGN_IN':
+            self.raise_login_required(method='password')
+        elif access_level != 'GRANTED':
+            self.report_warning(f'Unknown access level "{access_level}"')
+
+        player = self._download_json(
+            details['playerUrlCallback'], video_id, 'Downloading player JSON',
+            'Unable to download player JSON', headers={'Accept': 'application/json'})
+        is_live = {
+            'VOD': False,
+            'LIVE': True,
+        }.get(details.get('type'), video_type == 'live')
+
+        if is_live:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                player['hlsUrl'], video_id, 'mp4', m3u8_id='hls', live=True)
+        else:
+            formats, subtitles = self._extract_vod_formats_and_subtitles(player, video_id)
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'is_live': is_live,
+            **self._parse_details(details),
+        }
+
+
+class ShoutTVPlaylistBaseIE(ShoutTVBaseIE):
+    """Subclasses must set _PAGE_SIZE, _PLAYLIST_TYPE, _ENTRIES_KEY"""
+
+    def _create_entry(self, entry):
+        raise NotImplementedError('This method must be implemented by subclasses')
+
+    def _fetch_page(self, playlist_id, page=1, last_seen=None):
+        return self._call_api(
+            playlist_id, self._PLAYLIST_TYPE, note=f'{self._PLAYLIST_TYPE} page {page}',
+            query=filter_dict({'rpp': self._PAGE_SIZE, 'lastSeen': last_seen}))
+
+    def _entries(self, playlist_id, first_page):
+        last_seen = None
+        for page in itertools.count(1):
+            data = first_page if page == 1 else self._fetch_page(playlist_id, page, last_seen)
+            for entry in traverse_obj(data, (self._ENTRIES_KEY, lambda _, v: v['id'] is not None)):
+                yield self._create_entry(entry)
+
+            last_seen = traverse_obj(data, ('paging', 'lastSeen', {int}, {str_or_none}))
+            if not traverse_obj(data, ('paging', 'moreDataAvailable', {bool})) or not last_seen:
+                break
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        first_page = self._fetch_page(playlist_id)
+
+        return self.playlist_result(
+            self._entries(playlist_id, first_page), playlist_id,
+            **traverse_obj(first_page, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnails': (('titleUrl', 'posterUrl', 'coverUrl'), {'url': {url_or_none}}),
+                'series': ('series', 'title', {str}),
+                'series_id': ('series', 'seriesId', {int}, {str_or_none}),
+                'season_number': (
+                    'seasonNumber', {int_or_none},
+                    {lambda x: x if self._PLAYLIST_TYPE == 'season' else None}),
+            }))
+
+
+class ShoutTVSeasonIE(ShoutTVPlaylistBaseIE):
+    IE_NAME = 'shouttv:season'
+    IE_DESC = 'Shout! TV seasons'
+    _VALID_URL = r'https?://watch\.shout-tv\.com/season/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://watch.shout-tv.com/season/26338',
+        'info_dict': {
+            'id': '26338',
+            'title': 'The Commish: Season 2',
+            'description': 'md5:a5f99159e36d23af97a63137712c3b04',
+            'series': 'The Commish',
+            'series_id': '2695',
+            'season_number': 2,
+        },
+        'playlist_count': 22,
+    }]
+    _PAGE_SIZE = 5
+    _PLAYLIST_TYPE = 'season'
+    _ENTRIES_KEY = 'episodes'
+
+    def _create_entry(self, entry):
+        return self.url_result(
+            f'https://watch.shout-tv.com/video/{entry["id"]}', ShoutTVIE,
+            **self._parse_details(entry))
+
+
+class ShoutTVSeriesIE(ShoutTVPlaylistBaseIE):
+    IE_NAME = 'shouttv:series'
+    IE_DESC = 'Shout! TV series'
+    _VALID_URL = r'https?://watch\.shout-tv\.com/series/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://watch.shout-tv.com/series/2695',
+        'info_dict': {
+            'id': '2695',
+            'title': 'The Commish',
+            'description': 'md5:a5f99159e36d23af97a63137712c3b04',
+        },
+        'playlist_count': 5,
+    }]
+    _PAGE_SIZE = 20
+    _PLAYLIST_TYPE = 'series'
+    _ENTRIES_KEY = 'seasons'
+
+    def _create_entry(self, entry):
+        return self.url_result(
+            f'https://watch.shout-tv.com/season/{entry["id"]}', ShoutTVSeasonIE,
+            **traverse_obj(entry, {
+                'id': ('id', {int}, {str_or_none}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'season_id': ('id', {int}, {str_or_none}),
+                'season_number': ('seasonNumber', {int_or_none}),
+            }))

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'