generalize provider setup

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>

CONTRIBUTORS

@@ -770,8 +770,3 @@ NeonMan
 pj47x
 troex
 WouterGordts
-baierjan
-GeoffreyFrogeye
-Pawka
-v3DJG6GL
-yozel

Changelog.md

@@ -4,52 +4,6 @@
 # To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
 -->
 
-### 2025.05.22
-
-#### Core changes
-- **cookies**: [Fix Linux desktop environment detection](https://github.com/yt-dlp/yt-dlp/commit/e491fd4d090db3af52a82863fb0553dd5e17fb85) ([#13197](https://github.com/yt-dlp/yt-dlp/issues/13197)) by [mbway](https://github.com/mbway)
-- **jsinterp**: [Fix increment/decrement evaluation](https://github.com/yt-dlp/yt-dlp/commit/167d7a9f0ffd1b4fe600193441bdb7358db2740b) ([#13238](https://github.com/yt-dlp/yt-dlp/issues/13238)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-
-#### Extractor changes
-- **1tv**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/41c0a1fb89628696f8bb88e2b9f3a68f355b8c26) ([#13168](https://github.com/yt-dlp/yt-dlp/issues/13168)) by [bashonly](https://github.com/bashonly)
-- **amcnetworks**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/464c84fedf78eef822a431361155f108b5df96d7) ([#13147](https://github.com/yt-dlp/yt-dlp/issues/13147)) by [bashonly](https://github.com/bashonly)
-- **bitchute**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/1d0f6539c47e5d5c68c3c47cdb7075339e2885ac) ([#13081](https://github.com/yt-dlp/yt-dlp/issues/13081)) by [bashonly](https://github.com/bashonly)
-- **cartoonnetwork**: [Remove extractor](https://github.com/yt-dlp/yt-dlp/commit/7dbb47f84f0ee1266a3a01f58c9bc4c76d76794a) ([#13148](https://github.com/yt-dlp/yt-dlp/issues/13148)) by [bashonly](https://github.com/bashonly)
-- **iprima**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/a7d9a5eb79ceeecb851389f3f2c88597871ca3f2) ([#12937](https://github.com/yt-dlp/yt-dlp/issues/12937)) by [baierjan](https://github.com/baierjan)
-- **jiosaavn**
-    - artist: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/586b557b124f954d3f625360ebe970989022ad97) ([#12803](https://github.com/yt-dlp/yt-dlp/issues/12803)) by [subrat-lima](https://github.com/subrat-lima)
-    - playlist, show: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/317f4b8006c2c0f0f64f095b1485163ad97c9053) ([#12803](https://github.com/yt-dlp/yt-dlp/issues/12803)) by [subrat-lima](https://github.com/subrat-lima)
-    - show: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/6839276496d8814cf16f58b637e45663467928e6) ([#12803](https://github.com/yt-dlp/yt-dlp/issues/12803)) by [subrat-lima](https://github.com/subrat-lima)
-- **lrtradio**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/abf58dcd6a09e14eec4ea82ae12f79a0337cb383) ([#13200](https://github.com/yt-dlp/yt-dlp/issues/13200)) by [Pawka](https://github.com/Pawka)
-- **nebula**: [Support `--mark-watched`](https://github.com/yt-dlp/yt-dlp/commit/20f288bdc2173c7cc58d709d25ca193c1f6001e7) ([#13120](https://github.com/yt-dlp/yt-dlp/issues/13120)) by [GeoffreyFrogeye](https://github.com/GeoffreyFrogeye)
-- **niconico**
-    - [Fix error handling](https://github.com/yt-dlp/yt-dlp/commit/f569be4602c2a857087e495d5d7ed6060cd97abe) ([#13236](https://github.com/yt-dlp/yt-dlp/issues/13236)) by [bashonly](https://github.com/bashonly)
-    - live: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/7a7b85c9014d96421e18aa7ea5f4c1bee5ceece0) ([#13045](https://github.com/yt-dlp/yt-dlp/issues/13045)) by [doe1080](https://github.com/doe1080)
-- **nytimesarticle**: [Fix extraction](https://github.com/yt-dlp/yt-dlp/commit/b26bc32579c00ef579d75a835807ccc87d20ee0a) ([#13104](https://github.com/yt-dlp/yt-dlp/issues/13104)) by [bashonly](https://github.com/bashonly)
-- **once**: [Remove extractor](https://github.com/yt-dlp/yt-dlp/commit/f475e8b529d18efdad603ffda02a56e707fe0e2c) ([#13164](https://github.com/yt-dlp/yt-dlp/issues/13164)) by [bashonly](https://github.com/bashonly)
-- **picarto**: vod: [Support `/profile/` video URLs](https://github.com/yt-dlp/yt-dlp/commit/31e090cb787f3504ec25485adff9a2a51d056734) ([#13227](https://github.com/yt-dlp/yt-dlp/issues/13227)) by [subrat-lima](https://github.com/subrat-lima)
-- **playsuisse**: [Improve metadata extraction](https://github.com/yt-dlp/yt-dlp/commit/d880e060803ae8ed5a047e578cca01e1f0e630ce) ([#12466](https://github.com/yt-dlp/yt-dlp/issues/12466)) by [v3DJG6GL](https://github.com/v3DJG6GL)
-- **sprout**: [Remove extractor](https://github.com/yt-dlp/yt-dlp/commit/cbcfe6378dde33a650e3852ab17ad4503b8e008d) ([#13149](https://github.com/yt-dlp/yt-dlp/issues/13149)) by [bashonly](https://github.com/bashonly)
-- **svtpage**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/ea8498ed534642dd7e925961b97b934987142fd3) ([#12957](https://github.com/yt-dlp/yt-dlp/issues/12957)) by [diman8](https://github.com/diman8)
-- **twitch**: [Support `--live-from-start`](https://github.com/yt-dlp/yt-dlp/commit/00b1bec55249cf2ad6271d36492c51b34b6459d1) ([#13202](https://github.com/yt-dlp/yt-dlp/issues/13202)) by [bashonly](https://github.com/bashonly)
-- **vimeo**: event: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/545c1a5b6f2fe88722b41aef0e7485bf3be3f3f9) ([#13216](https://github.com/yt-dlp/yt-dlp/issues/13216)) by [bashonly](https://github.com/bashonly)
-- **wat.tv**: [Improve error handling](https://github.com/yt-dlp/yt-dlp/commit/f123cc83b3aea45053f5fa1d9141048b01fc2774) ([#13111](https://github.com/yt-dlp/yt-dlp/issues/13111)) by [bashonly](https://github.com/bashonly)
-- **weverse**: [Fix live extraction](https://github.com/yt-dlp/yt-dlp/commit/5328eda8820cc5f21dcf917684d23fbdca41831d) ([#13084](https://github.com/yt-dlp/yt-dlp/issues/13084)) by [bashonly](https://github.com/bashonly)
-- **xinpianchang**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/83fabf352489d52843f67e6e9cc752db86d27e6e) ([#13245](https://github.com/yt-dlp/yt-dlp/issues/13245)) by [garret1317](https://github.com/garret1317)
-- **youtube**
-    - [Add PO token support for subtitles](https://github.com/yt-dlp/yt-dlp/commit/32ed5f107c6c641958d1cd2752e130de4db55a13) ([#13234](https://github.com/yt-dlp/yt-dlp/issues/13234)) by [bashonly](https://github.com/bashonly), [coletdjnz](https://github.com/coletdjnz)
-    - [Add `web_embedded` client for age-restricted videos](https://github.com/yt-dlp/yt-dlp/commit/0feec6dc131f488428bf881519e7c69766fbb9ae) ([#13089](https://github.com/yt-dlp/yt-dlp/issues/13089)) by [bashonly](https://github.com/bashonly)
-    - [Add a PO Token Provider Framework](https://github.com/yt-dlp/yt-dlp/commit/2685654a37141cca63eda3a92da0e2706e23ccfd) ([#12840](https://github.com/yt-dlp/yt-dlp/issues/12840)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Extract `media_type` for all videos](https://github.com/yt-dlp/yt-dlp/commit/ded11ebc9afba6ba33923375103e9be2d7c804e7) ([#13136](https://github.com/yt-dlp/yt-dlp/issues/13136)) by [bashonly](https://github.com/bashonly)
-    - [Fix `--live-from-start` support for premieres](https://github.com/yt-dlp/yt-dlp/commit/8f303afb43395be360cafd7ad4ce2b6e2eedfb8a) ([#13079](https://github.com/yt-dlp/yt-dlp/issues/13079)) by [arabcoders](https://github.com/arabcoders)
-    - [Fix geo-restriction error handling](https://github.com/yt-dlp/yt-dlp/commit/c7e575e31608c19c5b26c10a4229db89db5fc9a8) ([#13217](https://github.com/yt-dlp/yt-dlp/issues/13217)) by [yozel](https://github.com/yozel)
-
-#### Misc. changes
-- **build**
-    - [Bump PyInstaller to v6.13.0](https://github.com/yt-dlp/yt-dlp/commit/17cf9088d0d535e4a7feffbf02bd49cd9dae5ab9) ([#13082](https://github.com/yt-dlp/yt-dlp/issues/13082)) by [bashonly](https://github.com/bashonly)
-    - [Bump run-on-arch-action to v3](https://github.com/yt-dlp/yt-dlp/commit/9064d2482d1fe722bbb4a49731fe0711c410d1c8) ([#13088](https://github.com/yt-dlp/yt-dlp/issues/13088)) by [bashonly](https://github.com/bashonly)
-- **cleanup**: Miscellaneous: [7977b32](https://github.com/yt-dlp/yt-dlp/commit/7977b329ed97b216e37bd402f4935f28c00eac9e) by [bashonly](https://github.com/bashonly)
-
 ### 2025.04.30
 
 #### Important changes

README.md

@@ -44,7 +44,6 @@ yt-dlp is a feature-rich command-line audio/video downloader with support for [t
     * [Post-processing Options](#post-processing-options)
     * [SponsorBlock Options](#sponsorblock-options)
     * [Extractor Options](#extractor-options)
-    * [Preset Aliases](#preset-aliases)
 * [CONFIGURATION](#configuration)
     * [Configuration file encoding](#configuration-file-encoding)
     * [Authentication with netrc](#authentication-with-netrc)
@@ -349,8 +348,8 @@ If you fork the project on GitHub, you can run your fork's [build workflow](.git
     --no-flat-playlist              Fully extract the videos of a playlist
                                     (default)
     --live-from-start               Download livestreams from the start.
-                                    Currently experimental and only supported
-                                    for YouTube and Twitch
+                                    Currently only supported for YouTube
+                                    (Experimental)
     --no-live-from-start            Download livestreams from the current time
                                     (default)
     --wait-for-video MIN[-MAX]      Wait for scheduled streams to become
@@ -376,12 +375,12 @@ If you fork the project on GitHub, you can run your fork's [build workflow](.git
                                     an alias starts with a dash "-", it is
                                     prefixed with "--". Arguments are parsed
                                     according to the Python string formatting
-                                    mini-language. E.g. --alias get-audio,-X "-S
-                                    aext:{0},abr -x --audio-format {0}" creates
-                                    options "--get-audio" and "-X" that takes an
-                                    argument (ARG0) and expands to "-S
-                                    aext:ARG0,abr -x --audio-format ARG0". All
-                                    defined aliases are listed in the --help
+                                    mini-language. E.g. --alias get-audio,-X
+                                    "-S=aext:{0},abr -x --audio-format {0}"
+                                    creates options "--get-audio" and "-X" that
+                                    takes an argument (ARG0) and expands to
+                                    "-S=aext:ARG0,abr -x --audio-format ARG0".
+                                    All defined aliases are listed in the --help
                                     output. Alias options can trigger more
                                     aliases; so be careful to avoid defining
                                     recursive options. As a safety measure, each
@@ -1106,10 +1105,6 @@ Make chapter entries for, or remove various segments (sponsor,
                                     arguments for different extractors
 
 ## Preset Aliases:
-Predefined aliases for convenience and ease of use. Note that future
-    versions of yt-dlp may add or adjust presets, but the existing preset
-    names will not be changed or removed
-
     -t mp3                          -f 'ba[acodec^=mp3]/ba/b' -x --audio-format
                                     mp3
 
@@ -1810,7 +1805,7 @@ The following extractors use this feature:
 * `raise_incomplete_data`: `Incomplete Data Received` raises an error instead of reporting a warning
 * `data_sync_id`: Overrides the account Data Sync ID used in Innertube API requests. This may be needed if you are using an account with `youtube:player_skip=webpage,configs` or `youtubetab:skip=webpage`
 * `visitor_data`: Overrides the Visitor Data used in Innertube API requests. This should be used with `player_skip=webpage,configs` and without cookies. Note: this may have adverse effects if used improperly. If a session from a browser is wanted, you should pass cookies instead (which contain the Visitor ID)
-* `po_token`:  Proof of Origin (PO) Token(s) to use. Comma seperated list of PO Tokens in the format `CLIENT.CONTEXT+PO_TOKEN`, e.g. `youtube:po_token=web.gvs+XXX,web.player=XXX,web_safari.gvs+YYY`. Context can be any of `gvs` (Google Video Server URLs), `player` (Innertube player request) or `subs` (Subtitles)
+* `po_token`:  Proof of Origin (PO) Token(s) to use. Comma seperated list of PO Tokens in the format `CLIENT.CONTEXT+PO_TOKEN`, e.g. `youtube:po_token=web.gvs+XXX,web.player=XXX,web_safari.gvs+YYY`. Context can be either `gvs` (Google Video Server URLs) or `player` (Innertube player request)
 * `pot_trace`: Enable debug logging for PO Token fetching. Either `true` or `false` (default)
 * `fetch_pot`: Policy to use for fetching a PO Token from providers. One of `always` (always try fetch a PO Token regardless if the client requires one for the given context), `never` (never fetch a PO Token), or `auto` (default; only fetch a PO Token if the client requires one for the given context)
 

supportedsites.md

@@ -246,6 +246,7 @@ The only reliable way to check if a site is supported is to try it.
  - **Canalplus**: mycanal.fr and piwiplus.fr
  - **Canalsurmas**
  - **CaracolTvPlay**: [*caracoltv-play*](## "netrc machine")
+ - **CartoonNetwork**
  - **cbc.ca**
  - **cbc.ca:player**
  - **cbc.ca:​player:playlist**
@@ -648,10 +649,7 @@ The only reliable way to check if a site is supported is to try it.
  - **jiocinema**: [*jiocinema*](## "netrc machine")
  - **jiocinema:series**: [*jiocinema*](## "netrc machine")
  - **jiosaavn:album**
- - **jiosaavn:artist**
  - **jiosaavn:playlist**
- - **jiosaavn:show**
- - **jiosaavn:​show:playlist**
  - **jiosaavn:song**
  - **Joj**
  - **JoqrAg**: 超!A&G+ 文化放送 (f.k.a. AGQR) Nippon Cultural Broadcasting, Inc. (JOQR)
@@ -1083,8 +1081,8 @@ The only reliable way to check if a site is supported is to try it.
  - **Photobucket**
  - **PiaLive**
  - **Piapro**: [*piapro*](## "netrc machine")
- - **picarto**
- - **picarto:vod**
+ - **Picarto**
+ - **PicartoVod**
  - **Piksel**
  - **Pinkbike**
  - **Pinterest**
@@ -1392,6 +1390,7 @@ The only reliable way to check if a site is supported is to try it.
  - **Spreaker**
  - **SpreakerShow**
  - **SpringboardPlatform**
+ - **Sprout**
  - **SproutVideo**
  - **sr:mediathek**: Saarländischer Rundfunk (**Currently broken**)
  - **SRGSSR**
@@ -1657,7 +1656,6 @@ The only reliable way to check if a site is supported is to try it.
  - **vimeo**: [*vimeo*](## "netrc machine")
  - **vimeo:album**: [*vimeo*](## "netrc machine")
  - **vimeo:channel**: [*vimeo*](## "netrc machine")
- - **vimeo:event**: [*vimeo*](## "netrc machine")
  - **vimeo:group**: [*vimeo*](## "netrc machine")
  - **vimeo:likes**: [*vimeo*](## "netrc machine") Vimeo user likes
  - **vimeo:ondemand**: [*vimeo*](## "netrc machine")

test/test_cookies.py

@@ -58,14 +58,6 @@ class TestCookies(unittest.TestCase):
             ({'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
             ({'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
 
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'gnome'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'mate'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
-
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'my_custom_de', 'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
-
             ({'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
             ({'KDE_FULL_SESSION': 1}, _LinuxDesktopEnvironment.KDE3),
             ({'KDE_FULL_SESSION': 1, 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),

test/test_jsinterp.py

@@ -478,14 +478,6 @@ class TestJSInterpreter(unittest.TestCase):
         func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
         self.assertEqual(func([1]), 1111)
 
-    def test_increment_decrement(self):
-        self._test('function f() { var x = 1; return ++x; }', 2)
-        self._test('function f() { var x = 1; return x++; }', 1)
-        self._test('function f() { var x = 1; x--; return x }', 0)
-        self._test('function f() { var y; var x = 1; x++, --x, x--, x--, y="z", "abc", x++; return --x }', -1)
-        self._test('function f() { var a = "test--"; return a; }', 'test--')
-        self._test('function f() { var b = 1; var a = "b--"; return a; }', 'b--')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_pot/conftest.py

@@ -1,5 +1,3 @@
-import collections
-
 import pytest
 
 from yt_dlp import YoutubeDL
@@ -16,22 +14,27 @@ class MockLogger(IEContentProviderLogger):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.messages = collections.defaultdict(list)
+        self.messages = {}
 
     def trace(self, message: str):
-        self.messages['trace'].append(message)
+        self.messages.setdefault('trace', []).append(message)
+        pass
 
     def debug(self, message: str):
-        self.messages['debug'].append(message)
+        self.messages.setdefault('debug', []).append(message)
+        pass
 
     def info(self, message: str):
-        self.messages['info'].append(message)
+        self.messages.setdefault('info', []).append(message)
+        pass
 
     def warning(self, message: str, *, once=False):
-        self.messages['warning'].append(message)
+        self.messages.setdefault('warning', []).append(message)
+        pass
 
     def error(self, message: str):
-        self.messages['error'].append(message)
+        self.messages.setdefault('error', []).append(message)
+        pass
 
 
 @pytest.fixture

test/test_pot/test_pot_builtin_memorycache.py

@@ -2,7 +2,7 @@ import threading
 import time
 from collections import OrderedDict
 import pytest
-from yt_dlp.extractor.youtube.pot._provider import IEContentProvider, BuiltinIEContentProvider
+from yt_dlp.extractor.youtube.pot._provider import IEContentProvider, BuiltInIEContentProvider
 from yt_dlp.utils import bug_reports_message
 from yt_dlp.extractor.youtube.pot._builtin.memory_cache import MemoryLRUPCP, memorylru_preference, initialize_global_cache
 from yt_dlp.version import __version__
@@ -13,7 +13,7 @@ class TestMemoryLRUPCS:
 
     def test_base_type(self):
         assert issubclass(MemoryLRUPCP, IEContentProvider)
-        assert issubclass(MemoryLRUPCP, BuiltinIEContentProvider)
+        assert issubclass(MemoryLRUPCP, BuiltInIEContentProvider)
 
     @pytest.fixture
     def pcp(self, ie, logger) -> MemoryLRUPCP:

test/test_pot/test_pot_builtin_utils.py

@@ -15,7 +15,6 @@ class TestGetWebPoContentBinding:
           for context, is_authenticated, expected in [
             (PoTokenContext.GVS, False, ('example-visitor-data', ContentBindingType.VISITOR_DATA)),
             (PoTokenContext.PLAYER, False, ('example-video-id', ContentBindingType.VIDEO_ID)),
-            (PoTokenContext.SUBS, False, ('example-video-id', ContentBindingType.VIDEO_ID)),
             (PoTokenContext.GVS, True, ('example-data-sync-id', ContentBindingType.DATASYNC_ID)),
         ]],
         ('WEB_REMIX', PoTokenContext.GVS, False, ('example-visitor-data', ContentBindingType.VISITOR_DATA)),

test/test_pot/test_pot_builtin_webpospec.py

@@ -1,6 +1,6 @@
 import pytest
 
-from yt_dlp.extractor.youtube.pot._provider import IEContentProvider, BuiltinIEContentProvider
+from yt_dlp.extractor.youtube.pot._provider import IEContentProvider, BuiltInIEContentProvider
 from yt_dlp.extractor.youtube.pot.cache import CacheProviderWritePolicy
 from yt_dlp.utils import bug_reports_message
 from yt_dlp.extractor.youtube.pot.provider import (
@@ -23,7 +23,7 @@ def pot_request(pot_request) -> PoTokenRequest:
 class TestWebPoPCSP:
     def test_base_type(self):
         assert issubclass(WebPoPCSP, IEContentProvider)
-        assert issubclass(WebPoPCSP, BuiltinIEContentProvider)
+        assert issubclass(WebPoPCSP, BuiltInIEContentProvider)
 
     def test_init(self, ie, logger):
         pcs = WebPoPCSP(ie=ie, logger=logger, settings={})

test/test_pot/test_pot_director.py

@@ -7,7 +7,7 @@ import json
 import time
 import pytest
 
-from yt_dlp.extractor.youtube.pot._provider import BuiltinIEContentProvider, IEContentProvider
+from yt_dlp.extractor.youtube.pot._provider import BuiltInIEContentProvider, IEContentProvider
 
 from yt_dlp.extractor.youtube.pot.provider import (
     PoTokenRequest,
@@ -578,8 +578,7 @@ class TestPoTokenCache:
         assert cache.get(pot_request) is None
         cache.store(pot_request, response)
         assert len(memorypcp.cache) == 1
-        assert hashlib.sha256(
-            f"{{'_dlp_cache': 'v1', '_p': 'ExampleProvider', 'v': '{pot_request.video_id}'}}".encode()).hexdigest() in memorypcp.cache
+        assert hashlib.sha256(f'_dlp_cachev1_pExampleProviderv{pot_request.video_id}'.encode()).hexdigest() in memorypcp.cache
 
         # The second spec provider returns the exact same key bindings as the first one,
         # however the PoTokenCache should use the provider key to differentiate between them
@@ -592,8 +591,7 @@ class TestPoTokenCache:
         assert cache.get(pot_request) is None
         cache.store(pot_request, response)
         assert len(memorypcp.cache) == 2
-        assert hashlib.sha256(
-            f"{{'_dlp_cache': 'v1', '_p': 'ExampleProviderTwo', 'v': '{pot_request.video_id}'}}".encode()).hexdigest() in memorypcp.cache
+        assert hashlib.sha256(f'_dlp_cachev1_pExampleProviderTwov{pot_request.video_id}'.encode()).hexdigest() in memorypcp.cache
 
     def test_cache_provider_preferences(self, pot_request, ie, logger):
         pcp_one = create_memory_pcp(ie, logger, provider_key='memory_pcp_one')
@@ -1480,11 +1478,11 @@ def test_validate_pot_response(response, expected):
 
 
 def test_built_in_provider(ie, logger):
-    class BuiltinProviderDefaultT(BuiltinIEContentProvider, suffix='T'):
+    class BuiltInProviderDefaultT(BuiltInIEContentProvider, suffix='T'):
         def is_available(self):
             return True
 
-    class BuiltinProviderCustomNameT(BuiltinIEContentProvider, suffix='T'):
+    class BuiltInProviderCustomNameT(BuiltInIEContentProvider, suffix='T'):
         PROVIDER_NAME = 'CustomName'
 
         def is_available(self):
@@ -1505,25 +1503,18 @@ def test_built_in_provider(ie, logger):
         def is_available(self) -> bool:
             return False
 
-    class BuiltinProviderUnavailableT(IEContentProvider, suffix='T'):
+    class BuiltInProviderUnavailableT(IEContentProvider, suffix='T'):
         def is_available(self) -> bool:
             return False
 
-    built_in_default = BuiltinProviderDefaultT(ie=ie, logger=logger, settings={})
-    built_in_custom_name = BuiltinProviderCustomNameT(ie=ie, logger=logger, settings={})
-    built_in_unavailable = BuiltinProviderUnavailableT(ie=ie, logger=logger, settings={})
+    built_in_default = BuiltInProviderDefaultT(ie=ie, logger=logger, settings={})
+    built_in_custom_name = BuiltInProviderCustomNameT(ie=ie, logger=logger, settings={})
+    built_in_unavailable = BuiltInProviderUnavailableT(ie=ie, logger=logger, settings={})
     external_default = ExternalProviderDefaultT(ie=ie, logger=logger, settings={})
     external_custom = ExternalProviderCustomT(ie=ie, logger=logger, settings={})
     external_unavailable = ExternalProviderUnavailableT(ie=ie, logger=logger, settings={})
 
     assert provider_display_list([]) == 'none'
-    assert provider_display_list([built_in_default]) == 'BuiltinProviderDefault'
+    assert provider_display_list([built_in_default]) == 'BuiltInProviderDefault'
     assert provider_display_list([external_unavailable]) == 'ExternalProviderUnavailable-0.0.0 (external, unavailable)'
-    assert provider_display_list([
-        built_in_default,
-        built_in_custom_name,
-        external_default,
-        external_custom,
-        external_unavailable,
-        built_in_unavailable],
-    ) == 'BuiltinProviderDefault, CustomName, ExternalProviderDefault-0.0.0 (external), custom-5.4b2 (external), ExternalProviderUnavailable-0.0.0 (external, unavailable), BuiltinProviderUnavailable-0.0.0 (external, unavailable)'
+    assert provider_display_list([built_in_default, built_in_custom_name, external_default, external_custom, external_unavailable, built_in_unavailable]) == 'BuiltInProviderDefault, CustomName, ExternalProviderDefault-0.0.0 (external), custom-5.4b2 (external), ExternalProviderUnavailable-0.0.0 (external, unavailable), BuiltInProviderUnavailable-0.0.0 (external, unavailable)'

test/test_youtube_signature.py

@@ -316,10 +316,6 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
         'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
     ),
-    (
-        'https://www.youtube.com/s/player/59b252b9/player_ias.vflset/en_US/base.js',
-        'D3XWVpYgwhLLKNK4AGX', 'aZrQ1qWJ5yv5h',
-    ),
 ]
 
 

yt_dlp/cookies.py

@@ -764,11 +764,11 @@ def _get_linux_desktop_environment(env, logger):
     GetDesktopEnvironment
     """
     xdg_current_desktop = env.get('XDG_CURRENT_DESKTOP', None)
-    desktop_session = env.get('DESKTOP_SESSION', '')
+    desktop_session = env.get('DESKTOP_SESSION', None)
     if xdg_current_desktop is not None:
         for part in map(str.strip, xdg_current_desktop.split(':')):
             if part == 'Unity':
-                if 'gnome-fallback' in desktop_session:
+                if desktop_session is not None and 'gnome-fallback' in desktop_session:
                     return _LinuxDesktopEnvironment.GNOME
                 else:
                     return _LinuxDesktopEnvironment.UNITY
@@ -797,34 +797,35 @@ def _get_linux_desktop_environment(env, logger):
                 return _LinuxDesktopEnvironment.UKUI
             elif part == 'LXQt':
                 return _LinuxDesktopEnvironment.LXQT
-        logger.debug(f'XDG_CURRENT_DESKTOP is set to an unknown value: "{xdg_current_desktop}"')
+        logger.info(f'XDG_CURRENT_DESKTOP is set to an unknown value: "{xdg_current_desktop}"')
 
-    if desktop_session == 'deepin':
-        return _LinuxDesktopEnvironment.DEEPIN
-    elif desktop_session in ('mate', 'gnome'):
-        return _LinuxDesktopEnvironment.GNOME
-    elif desktop_session in ('kde4', 'kde-plasma'):
-        return _LinuxDesktopEnvironment.KDE4
-    elif desktop_session == 'kde':
-        if 'KDE_SESSION_VERSION' in env:
+    elif desktop_session is not None:
+        if desktop_session == 'deepin':
+            return _LinuxDesktopEnvironment.DEEPIN
+        elif desktop_session in ('mate', 'gnome'):
+            return _LinuxDesktopEnvironment.GNOME
+        elif desktop_session in ('kde4', 'kde-plasma'):
             return _LinuxDesktopEnvironment.KDE4
+        elif desktop_session == 'kde':
+            if 'KDE_SESSION_VERSION' in env:
+                return _LinuxDesktopEnvironment.KDE4
+            else:
+                return _LinuxDesktopEnvironment.KDE3
+        elif 'xfce' in desktop_session or desktop_session == 'xubuntu':
+            return _LinuxDesktopEnvironment.XFCE
+        elif desktop_session == 'ukui':
+            return _LinuxDesktopEnvironment.UKUI
         else:
-            return _LinuxDesktopEnvironment.KDE3
-    elif 'xfce' in desktop_session or desktop_session == 'xubuntu':
-        return _LinuxDesktopEnvironment.XFCE
-    elif desktop_session == 'ukui':
-        return _LinuxDesktopEnvironment.UKUI
+            logger.info(f'DESKTOP_SESSION is set to an unknown value: "{desktop_session}"')
+
     else:
-        logger.debug(f'DESKTOP_SESSION is set to an unknown value: "{desktop_session}"')
-
-    if 'GNOME_DESKTOP_SESSION_ID' in env:
-        return _LinuxDesktopEnvironment.GNOME
-    elif 'KDE_FULL_SESSION' in env:
-        if 'KDE_SESSION_VERSION' in env:
-            return _LinuxDesktopEnvironment.KDE4
-        else:
-            return _LinuxDesktopEnvironment.KDE3
-
+        if 'GNOME_DESKTOP_SESSION_ID' in env:
+            return _LinuxDesktopEnvironment.GNOME
+        elif 'KDE_FULL_SESSION' in env:
+            if 'KDE_SESSION_VERSION' in env:
+                return _LinuxDesktopEnvironment.KDE4
+            else:
+                return _LinuxDesktopEnvironment.KDE3
     return _LinuxDesktopEnvironment.OTHER
 
 

yt_dlp/extractor/_extractors.py

@@ -2369,7 +2369,6 @@ from .vimeo import (
     VHXEmbedIE,
     VimeoAlbumIE,
     VimeoChannelIE,
-    VimeoEventIE,
     VimeoGroupsIE,
     VimeoIE,
     VimeoLikesIE,

yt_dlp/extractor/espn.py

@@ -5,6 +5,7 @@ import urllib.parse
 
 from .adobepass import AdobePassIE
 from .common import InfoExtractor
+from .once import OnceIE
 from ..utils import (
     determine_ext,
     dict_get,
@@ -15,7 +16,7 @@ from ..utils import (
 )
 
 
-class ESPNIE(InfoExtractor):
+class ESPNIE(OnceIE):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
@@ -130,7 +131,9 @@ class ESPNIE(InfoExtractor):
                 return
             format_urls.add(source_url)
             ext = determine_ext(source_url)
-            if ext == 'smil':
+            if OnceIE.suitable(source_url):
+                formats.extend(self._extract_once_formats(source_url))
+            elif ext == 'smil':
                 formats.extend(self._extract_smil_formats(
                     source_url, video_id, fatal=False))
             elif ext == 'f4m':

yt_dlp/extractor/firsttv.py

@@ -2,15 +2,11 @@ import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     int_or_none,
-    join_nonempty,
-    mimetype2ext,
-    parse_qs,
+    qualities,
     unified_strdate,
     url_or_none,
 )
-from ..utils.traversal import traverse_obj
 
 
 class FirstTVIE(InfoExtractor):
@@ -19,51 +15,40 @@ class FirstTVIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?(?:sport)?1tv\.ru/(?:[^/?#]+/)+(?P<id>[^/?#]+)'
 
     _TESTS = [{
-        # single format; has item.id
-        'url': 'https://www.1tv.ru/shows/naedine-so-vsemi/vypuski/gost-lyudmila-senchina-naedine-so-vsemi-vypusk-ot-12-02-2015',
-        'md5': '8011ae8e88ff4150107ab9c5a8f5b659',
+        # single format
+        'url': 'http://www.1tv.ru/shows/naedine-so-vsemi/vypuski/gost-lyudmila-senchina-naedine-so-vsemi-vypusk-ot-12-02-2015',
+        'md5': 'a1b6b60d530ebcf8daacf4565762bbaf',
         'info_dict': {
             'id': '40049',
             'ext': 'mp4',
             'title': 'Гость Людмила Сенчина. Наедине со всеми. Выпуск от 12.02.2015',
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'thumbnail': r're:^https?://.*\.(?:jpg|JPG)$',
             'upload_date': '20150212',
             'duration': 2694,
         },
-        'params': {'skip_download': 'm3u8'},
     }, {
-        # multiple formats; has item.id
-        'url': 'https://www.1tv.ru/shows/dobroe-utro/pro-zdorove/vesennyaya-allergiya-dobroe-utro-fragment-vypuska-ot-07042016',
+        # multiple formats
+        'url': 'http://www.1tv.ru/shows/dobroe-utro/pro-zdorove/vesennyaya-allergiya-dobroe-utro-fragment-vypuska-ot-07042016',
         'info_dict': {
             'id': '364746',
             'ext': 'mp4',
             'title': 'Весенняя аллергия. Доброе утро. Фрагмент выпуска от 07.04.2016',
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'thumbnail': r're:^https?://.*\.(?:jpg|JPG)$',
             'upload_date': '20160407',
             'duration': 179,
             'formats': 'mincount:3',
         },
-        'params': {'skip_download': 'm3u8'},
+        'params': {
+            'skip_download': True,
+        },
     }, {
-        'url': 'https://www.1tv.ru/news/issue/2016-12-01/14:00',
+        'url': 'http://www.1tv.ru/news/issue/2016-12-01/14:00',
         'info_dict': {
             'id': '14:00',
-            'title': 'Выпуск программы «Время» в 20:00   1 декабря 2016 года. Новости. Первый канал',
-            'thumbnail': 'https://static.1tv.ru/uploads/photo/image/8/big/338448_big_8fc7eb236f.jpg',
+            'title': 'Выпуск новостей в 14:00   1 декабря 2016 года. Новости. Первый канал',
+            'description': 'md5:2e921b948f8c1ff93901da78ebdb1dfd',
         },
         'playlist_count': 13,
-    }, {
-        # has timestamp; has item.uid but not item.id
-        'url': 'https://www.1tv.ru/shows/segodnya-vecherom/vypuski/avtory-odnogo-hita-segodnya-vecherom-vypusk-ot-03-05-2025',
-        'info_dict': {
-            'id': '270411',
-            'ext': 'mp4',
-            'title': 'Авторы одного хита. Сегодня вечером. Выпуск от 03.05.2025',
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1746286020,
-            'upload_date': '20250503',
-        },
-        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'http://www.1tv.ru/shows/tochvtoch-supersezon/vystupleniya/evgeniy-dyatlov-vladimir-vysockiy-koni-priveredlivye-toch-v-toch-supersezon-fragment-vypuska-ot-06-11-2016',
         'only_matching': True,
@@ -72,60 +57,96 @@ class FirstTVIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    def _entries(self, items):
-        for item in items:
-            video_id = str(item.get('id') or item['uid'])
-
-            formats, subtitles = [], {}
-            for f in traverse_obj(item, ('sources', lambda _, v: url_or_none(v['src']))):
-                src = f['src']
-                ext = mimetype2ext(f.get('type'), default=determine_ext(src))
-                if ext == 'm3u8':
-                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                        src, video_id, 'mp4', m3u8_id='hls', fatal=False)
-                elif ext == 'mpd':
-                    fmts, subs = self._extract_mpd_formats_and_subtitles(
-                        src, video_id, mpd_id='dash', fatal=False)
-                else:
-                    tbr = self._search_regex(fr'_(\d{{3,}})\.{ext}', src, 'tbr', default=None)
-                    formats.append({
-                        'url': src,
-                        'ext': ext,
-                        'format_id': join_nonempty('http', ext, tbr),
-                        'tbr': int_or_none(tbr),
-                        # quality metadata of http formats may be incorrect
-                        'quality': -10,
-                    })
-                    continue
-                formats.extend(fmts)
-                self._merge_subtitles(subs, target=subtitles)
-
-            yield {
-                **traverse_obj(item, {
-                    'title': ('title', {str}),
-                    'thumbnail': ('poster', {url_or_none}),
-                    'timestamp': ('dvr_begin_at', {int_or_none}),
-                    'upload_date': ('date_air', {unified_strdate}),
-                    'duration': ('duration', {int_or_none}),
-                }),
-                'id': video_id,
-                'formats': formats,
-                'subtitles': subtitles,
-            }
-
     def _real_extract(self, url):
         display_id = self._match_id(url)
 
         webpage = self._download_webpage(url, display_id)
-        playlist_url = urllib.parse.urljoin(url, self._html_search_regex(
+        playlist_url = urllib.parse.urljoin(url, self._search_regex(
             r'data-playlist-url=(["\'])(?P<url>(?:(?!\1).)+)\1',
             webpage, 'playlist url', group='url'))
 
-        item_ids = traverse_obj(parse_qs(playlist_url), 'video_id', 'videos_ids[]', 'news_ids[]')
-        items = traverse_obj(
-            self._download_json(playlist_url, display_id),
-            lambda _, v: v['uid'] and (str(v['uid']) in item_ids if item_ids else True))
+        parsed_url = urllib.parse.urlparse(playlist_url)
+        qs = urllib.parse.parse_qs(parsed_url.query)
+        item_ids = qs.get('videos_ids[]') or qs.get('news_ids[]')
 
-        return self.playlist_result(
-            self._entries(items), display_id, self._og_search_title(webpage, default=None),
-            thumbnail=self._og_search_thumbnail(webpage, default=None))
+        items = self._download_json(playlist_url, display_id)
+
+        if item_ids:
+            items = [
+                item for item in items
+                if item.get('uid') and str(item['uid']) in item_ids]
+        else:
+            items = [items[0]]
+
+        entries = []
+        QUALITIES = ('ld', 'sd', 'hd')
+
+        for item in items:
+            title = item['title']
+            quality = qualities(QUALITIES)
+            formats = []
+            path = None
+            for f in item.get('mbr', []):
+                src = url_or_none(f.get('src'))
+                if not src:
+                    continue
+                tbr = int_or_none(self._search_regex(
+                    r'_(\d{3,})\.mp4', src, 'tbr', default=None))
+                if not path:
+                    path = self._search_regex(
+                        r'//[^/]+/(.+?)_\d+\.mp4', src,
+                        'm3u8 path', default=None)
+                formats.append({
+                    'url': src,
+                    'format_id': f.get('name'),
+                    'tbr': tbr,
+                    'source_preference': quality(f.get('name')),
+                    # quality metadata of http formats may be incorrect
+                    'preference': -10,
+                })
+            # m3u8 URL format is reverse engineered from [1] (search for
+            # master.m3u8). dashEdges (that is currently balancer-vod.1tv.ru)
+            # is taken from [2].
+            # 1. http://static.1tv.ru/player/eump1tv-current/eump-1tv.all.min.js?rnd=9097422834:formatted
+            # 2. http://static.1tv.ru/player/eump1tv-config/config-main.js?rnd=9097422834
+            if not path and len(formats) == 1:
+                path = self._search_regex(
+                    r'//[^/]+/(.+?$)', formats[0]['url'],
+                    'm3u8 path', default=None)
+            if path:
+                if len(formats) == 1:
+                    m3u8_path = ','
+                else:
+                    tbrs = [str(t) for t in sorted(f['tbr'] for f in formats)]
+                    m3u8_path = '_,{},{}'.format(','.join(tbrs), '.mp4')
+                formats.extend(self._extract_m3u8_formats(
+                    f'http://balancer-vod.1tv.ru/{path}{m3u8_path}.urlset/master.m3u8',
+                    display_id, 'mp4',
+                    entry_protocol='m3u8_native', m3u8_id='hls', fatal=False))
+
+            thumbnail = item.get('poster') or self._og_search_thumbnail(webpage)
+            duration = int_or_none(item.get('duration') or self._html_search_meta(
+                'video:duration', webpage, 'video duration', fatal=False))
+            upload_date = unified_strdate(self._html_search_meta(
+                'ya:ovs:upload_date', webpage, 'upload date', default=None))
+
+            entries.append({
+                'id': str(item.get('id') or item['uid']),
+                'thumbnail': thumbnail,
+                'title': title,
+                'upload_date': upload_date,
+                'duration': int_or_none(duration),
+                'formats': formats,
+            })
+
+        title = self._html_search_regex(
+            (r'<div class="tv_translation">\s*<h1><a href="[^"]+">([^<]*)</a>',
+             r"'title'\s*:\s*'([^']+)'"),
+            webpage, 'title', default=None) or self._og_search_title(
+            webpage, default=None)
+        description = self._html_search_regex(
+            r'<div class="descr">\s*<div>&nbsp;</div>\s*<p>([^<]*)</p></div>',
+            webpage, 'description', default=None) or self._html_search_meta(
+            'description', webpage, 'description', default=None)
+
+        return self.playlist_result(entries, display_id, title, description)

yt_dlp/extractor/gamespot.py

@@ -1,9 +1,9 @@
 import urllib.parse
 
-from .common import InfoExtractor
+from .once import OnceIE
 
 
-class GameSpotIE(InfoExtractor):
+class GameSpotIE(OnceIE):
     _VALID_URL = r'https?://(?:www\.)?gamespot\.com/(?:video|article|review)s/(?:[^/]+/\d+-|embed/)(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://www.gamespot.com/videos/arma-3-community-guide-sitrep-i/2300-6410818/',

yt_dlp/extractor/iprima.py

@@ -1,4 +1,3 @@
-import json
 import re
 import time
 
@@ -7,7 +6,9 @@ from ..utils import (
     ExtractorError,
     determine_ext,
     js_to_json,
+    parse_qs,
     traverse_obj,
+    urlencode_postdata,
 )
 
 
@@ -15,6 +16,7 @@ class IPrimaIE(InfoExtractor):
     _VALID_URL = r'https?://(?!cnn)(?:[^/]+)\.iprima\.cz/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _GEO_BYPASS = False
     _NETRC_MACHINE = 'iprima'
+    _AUTH_ROOT = 'https://auth.iprima.cz'
     access_token = None
 
     _TESTS = [{
@@ -84,18 +86,48 @@ class IPrimaIE(InfoExtractor):
         if self.access_token:
             return
 
-        token_data = self._download_json(
-            'https://ucet.iprima.cz/api/session/create', None,
-            note='Logging in', errnote='Failed to log in',
-            data=json.dumps({
-                'email': username,
-                'password': password,
-                'deviceName': 'Windows Chrome',
-            }).encode(), headers={'content-type': 'application/json'})
+        login_page = self._download_webpage(
+            f'{self._AUTH_ROOT}/oauth2/login', None, note='Downloading login page',
+            errnote='Downloading login page failed')
 
-        self.access_token = token_data['accessToken']['value']
-        if not self.access_token:
-            raise ExtractorError('Failed to fetch access token')
+        login_form = self._hidden_inputs(login_page)
+
+        login_form.update({
+            '_email': username,
+            '_password': password})
+
+        profile_select_html, login_handle = self._download_webpage_handle(
+            f'{self._AUTH_ROOT}/oauth2/login', None, data=urlencode_postdata(login_form),
+            note='Logging in')
+
+        # a profile may need to be selected first, even when there is only a single one
+        if '/profile-select' in login_handle.url:
+            profile_id = self._search_regex(
+                r'data-identifier\s*=\s*["\']?(\w+)', profile_select_html, 'profile id')
+
+            login_handle = self._request_webpage(
+                f'{self._AUTH_ROOT}/user/profile-select-perform/{profile_id}', None,
+                query={'continueUrl': '/user/login?redirect_uri=/user/'}, note='Selecting profile')
+
+        code = traverse_obj(login_handle.url, ({parse_qs}, 'code', 0))
+        if not code:
+            raise ExtractorError('Login failed', expected=True)
+
+        token_request_data = {
+            'scope': 'openid+email+profile+phone+address+offline_access',
+            'client_id': 'prima_sso',
+            'grant_type': 'authorization_code',
+            'code': code,
+            'redirect_uri': f'{self._AUTH_ROOT}/sso/auth-check'}
+
+        token_data = self._download_json(
+            f'{self._AUTH_ROOT}/oauth2/token', None,
+            note='Downloading token', errnote='Downloading token failed',
+            data=urlencode_postdata(token_request_data))
+
+        self.access_token = token_data.get('access_token')
+        if self.access_token is None:
+            raise ExtractorError('Getting token failed', expected=True)
 
     def _real_initialize(self):
         if not self.access_token:

yt_dlp/extractor/lrt.py

@@ -2,6 +2,7 @@ from .common import InfoExtractor
 from ..utils import (
     clean_html,
     merge_dicts,
+    str_or_none,
     traverse_obj,
     unified_timestamp,
     url_or_none,
@@ -137,15 +138,13 @@ class LRTRadioIE(LRTBaseIE):
             'https://www.lrt.lt/radioteka/api/media', video_id,
             query={'url': f'/mediateka/irasas/{video_id}/{path}'})
 
-        return {
-            'id': video_id,
-            'formats': self._extract_m3u8_formats(media['playlist_item']['file'], video_id),
-            **traverse_obj(media, {
-                'title': ('title', {str}),
-                'tags': ('tags', ..., 'name', {str}),
-                'categories': ('playlist_item', 'category', {str}, filter, all, filter),
-                'description': ('content', {clean_html}, {str}),
-                'timestamp': ('date', {lambda x: x.replace('.', '/')}, {unified_timestamp}),
-                'thumbnail': ('playlist_item', 'image', {urljoin('https://www.lrt.lt')}),
-            }),
-        }
+        return traverse_obj(media, {
+            'id': ('id', {int}, {str_or_none}),
+            'title': ('title', {str}),
+            'tags': ('tags', ..., 'name', {str}),
+            'categories': ('playlist_item', 'category', {str}, filter, all, filter),
+            'description': ('content', {clean_html}, {str}),
+            'timestamp': ('date', {lambda x: x.replace('.', '/')}, {unified_timestamp}),
+            'thumbnail': ('playlist_item', 'image', {urljoin('https://www.lrt.lt')}),
+            'formats': ('playlist_item', 'file', {lambda x: self._extract_m3u8_formats(x, video_id)}),
+        })

yt_dlp/extractor/nebula.py

@@ -3,7 +3,6 @@ import json
 
 from .art19 import Art19IE
 from .common import InfoExtractor
-from ..networking import PATCHRequest
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -75,7 +74,7 @@ class NebulaBaseIE(InfoExtractor):
                         'app_version': '23.10.0',
                         'platform': 'ios',
                     })
-                break
+                return {'formats': fmts, 'subtitles': subs}
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 401:
                     self.raise_login_required()
@@ -85,9 +84,6 @@ class NebulaBaseIE(InfoExtractor):
                     continue
                 raise
 
-        self.mark_watched(content_id, slug)
-        return {'formats': fmts, 'subtitles': subs}
-
     def _extract_video_metadata(self, episode):
         channel_url = traverse_obj(
             episode, (('channel_slug', 'class_slug'), {urljoin('https://nebula.tv/')}), get_all=False)
@@ -115,13 +111,6 @@ class NebulaBaseIE(InfoExtractor):
             'uploader_url': channel_url,
         }
 
-    def _mark_watched(self, content_id, slug):
-        self._call_api(
-            PATCHRequest(f'https://content.api.nebula.app/{content_id.split(":")[0]}s/{content_id}/progress/'),
-            slug, 'Marking watched', 'Unable to mark watched', fatal=False,
-            data=json.dumps({'completed': True}).encode(),
-            headers={'content-type': 'application/json'})
-
 
 class NebulaIE(NebulaBaseIE):
     IE_NAME = 'nebula:video'
@@ -333,7 +322,6 @@ class NebulaClassIE(NebulaBaseIE):
             if not episode_url and metadata.get('premium'):
                 self.raise_login_required()
 
-            self.mark_watched(metadata['id'], slug)
             if Art19IE.suitable(episode_url):
                 return self.url_result(episode_url, Art19IE)
             return traverse_obj(metadata, {

yt_dlp/extractor/niconico.py

@@ -32,7 +32,7 @@ from ..utils import (
     urlencode_postdata,
     urljoin,
 )
-from ..utils.traversal import find_element, require, traverse_obj
+from ..utils.traversal import find_element, traverse_obj
 
 
 class NiconicoBaseIE(InfoExtractor):
@@ -283,54 +283,35 @@ class NiconicoIE(NiconicoBaseIE):
                 lambda _, v: v['id'] == video_fmt['format_id'], 'qualityLevel', {int_or_none}, any)) or -1
             yield video_fmt
 
-    def _extract_server_response(self, webpage, video_id, fatal=True):
-        try:
-            return traverse_obj(
-                self._parse_json(self._html_search_meta('server-response', webpage) or '', video_id),
-                ('data', 'response', {dict}, {require('server response')}))
-        except ExtractorError:
-            if not fatal:
-                return {}
-            raise
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
         try:
             webpage, handle = self._download_webpage_handle(
-                f'https://www.nicovideo.jp/watch/{video_id}', video_id,
-                headers=self.geo_verification_headers())
+                'https://www.nicovideo.jp/watch/' + video_id, video_id)
             if video_id.startswith('so'):
                 video_id = self._match_id(handle.url)
 
-            api_data = self._extract_server_response(webpage, video_id)
+            api_data = traverse_obj(
+                self._parse_json(self._html_search_meta('server-response', webpage) or '', video_id),
+                ('data', 'response', {dict}))
+            if not api_data:
+                raise ExtractorError('Server response data not found')
         except ExtractorError as e:
             try:
                 api_data = self._download_json(
-                    f'https://www.nicovideo.jp/api/watch/v3/{video_id}', video_id,
-                    'Downloading API JSON', 'Unable to fetch data', query={
-                        '_frontendId': '6',
-                        '_frontendVersion': '0',
-                        'actionTrackId': f'AAAAAAAAAA_{round(time.time() * 1000)}',
-                    }, headers=self.geo_verification_headers())['data']
+                    f'https://www.nicovideo.jp/api/watch/v3/{video_id}?_frontendId=6&_frontendVersion=0&actionTrackId=AAAAAAAAAA_{round(time.time() * 1000)}', video_id,
+                    note='Downloading API JSON', errnote='Unable to fetch data')['data']
             except ExtractorError:
                 if not isinstance(e.cause, HTTPError):
-                    # Raise if original exception was from _parse_json or utils.traversal.require
                     raise
-                # The webpage server response has more detailed error info than the API response
                 webpage = e.cause.response.read().decode('utf-8', 'replace')
-                reason_code = self._extract_server_response(
-                    webpage, video_id, fatal=False).get('reasonCode')
-                if not reason_code:
+                error_msg = self._html_search_regex(
+                    r'(?s)<section\s+class="(?:(?:ErrorMessage|WatchExceptionPage-message)\s*)+">(.+?)</section>',
+                    webpage, 'error reason', default=None)
+                if not error_msg:
                     raise
-                if reason_code in ('DOMESTIC_VIDEO', 'HIGH_RISK_COUNTRY_VIDEO'):
-                    self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
-                elif reason_code == 'HIDDEN_VIDEO':
-                    raise ExtractorError(
-                        'The viewing period of this video has expired', expected=True)
-                elif reason_code == 'DELETED_VIDEO':
-                    raise ExtractorError('This video has been deleted', expected=True)
-                raise ExtractorError(f'Niconico says: {reason_code}')
+                raise ExtractorError(clean_html(error_msg), expected=True)
 
         availability = self._availability(**(traverse_obj(api_data, ('payment', 'video', {
             'needs_premium': ('isPremium', {bool}),

yt_dlp/extractor/once.py

@@ -0,0 +1,40 @@
+import re
+
+from .common import InfoExtractor
+
+
+class OnceIE(InfoExtractor):  # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
+    _VALID_URL = r'https?://.+?\.unicornmedia\.com/now/(?:ads/vmap/)?[^/]+/[^/]+/(?P<domain_id>[^/]+)/(?P<application_id>[^/]+)/(?:[^/]+/)?(?P<media_item_id>[^/]+)/content\.(?:once|m3u8|mp4)'
+    ADAPTIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/master/playlist/%s/%s/%s/content.m3u8'
+    PROGRESSIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/media/progressive/%s/%s/%s/%s/content.mp4'
+
+    def _extract_once_formats(self, url, http_formats_preference=None):
+        domain_id, application_id, media_item_id = re.match(
+            OnceIE._VALID_URL, url).groups()
+        formats = self._extract_m3u8_formats(
+            self.ADAPTIVE_URL_TEMPLATE % (
+                domain_id, application_id, media_item_id),
+            media_item_id, 'mp4', m3u8_id='hls', fatal=False)
+        progressive_formats = []
+        for adaptive_format in formats:
+            # Prevent advertisement from embedding into m3u8 playlist (see
+            # https://github.com/ytdl-org/youtube-dl/issues/8893#issuecomment-199912684)
+            adaptive_format['url'] = re.sub(
+                r'\badsegmentlength=\d+', r'adsegmentlength=0', adaptive_format['url'])
+            rendition_id = self._search_regex(
+                r'/now/media/playlist/[^/]+/[^/]+/([^/]+)',
+                adaptive_format['url'], 'redition id', default=None)
+            if rendition_id:
+                progressive_format = adaptive_format.copy()
+                progressive_format.update({
+                    'url': self.PROGRESSIVE_URL_TEMPLATE % (
+                        domain_id, application_id, rendition_id, media_item_id),
+                    'format_id': adaptive_format['format_id'].replace(
+                        'hls', 'http'),
+                    'protocol': 'http',
+                    'preference': http_formats_preference,
+                })
+                progressive_formats.append(progressive_format)
+        self._check_formats(progressive_formats, media_item_id)
+        formats.extend(progressive_formats)
+        return formats

yt_dlp/extractor/picarto.py

@@ -10,8 +10,7 @@ from ..utils import (
 
 
 class PicartoIE(InfoExtractor):
-    IE_NAME = 'picarto'
-    _VALID_URL = r'https?://(?:www.)?picarto\.tv/(?P<id>[^/#?]+)/?(?:$|[?#])'
+    _VALID_URL = r'https?://(?:www.)?picarto\.tv/(?P<id>[a-zA-Z0-9]+)'
     _TEST = {
         'url': 'https://picarto.tv/Setz',
         'info_dict': {
@@ -90,8 +89,7 @@ class PicartoIE(InfoExtractor):
 
 
 class PicartoVodIE(InfoExtractor):
-    IE_NAME = 'picarto:vod'
-    _VALID_URL = r'https?://(?:www\.)?picarto\.tv/(?:videopopout|\w+(?:/profile)?/videos)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?picarto\.tv/(?:videopopout|\w+/videos)/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://picarto.tv/videopopout/ArtofZod_2017.12.12.00.13.23.flv',
         'md5': '3ab45ba4352c52ee841a28fb73f2d9ca',
@@ -113,18 +111,6 @@ class PicartoVodIE(InfoExtractor):
             'channel': 'ArtofZod',
             'age_limit': 18,
         },
-    }, {
-        'url': 'https://picarto.tv/DrechuArt/profile/videos/400347',
-        'md5': 'f9ea54868b1d9dec40eb554b484cc7bf',
-        'info_dict': {
-            'id': '400347',
-            'ext': 'mp4',
-            'title': 'Welcome to the Show',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'channel': 'DrechuArt',
-            'age_limit': 0,
-        },
-
     }, {
         'url': 'https://picarto.tv/videopopout/Plague',
         'only_matching': True,

yt_dlp/extractor/playsuisse.py

@@ -9,10 +9,11 @@ from ..utils import (
     int_or_none,
     join_nonempty,
     parse_qs,
+    traverse_obj,
     update_url_query,
     urlencode_postdata,
 )
-from ..utils.traversal import traverse_obj, unpack
+from ..utils.traversal import unpack
 
 
 class PlaySuisseIE(InfoExtractor):

yt_dlp/extractor/soundcloud.py

@@ -697,7 +697,7 @@ class SoundcloudIE(SoundcloudBaseIE):
             try:
                 return self._extract_info_dict(info, full_title, token)
             except ExtractorError as e:
-                if not isinstance(e.cause, HTTPError) or e.cause.status != 429:
+                if not isinstance(e.cause, HTTPError) or not e.cause.status == 429:
                     raise
                 self.report_warning(
                     'You have reached the API rate limit, which is ~600 requests per '

yt_dlp/extractor/theplatform.py

@@ -4,6 +4,7 @@ import re
 import time
 
 from .adobepass import AdobePassIE
+from .once import OnceIE
 from ..networking import HEADRequest, Request
 from ..utils import (
     ExtractorError,
@@ -25,7 +26,7 @@ default_ns = 'http://www.w3.org/2005/SMIL21/Language'
 _x = lambda p: xpath_with_ns(p, {'smil': default_ns})
 
 
-class ThePlatformBaseIE(AdobePassIE):
+class ThePlatformBaseIE(OnceIE):
     _TP_TLD = 'com'
 
     def _extract_theplatform_smil(self, smil_url, video_id, note='Downloading SMIL data'):
@@ -53,13 +54,16 @@ class ThePlatformBaseIE(AdobePassIE):
 
         formats = []
         for _format in smil_formats:
-            media_url = _format['url']
-            if determine_ext(media_url) == 'm3u8':
-                hdnea2 = self._get_cookies(media_url).get('hdnea2')
-                if hdnea2:
-                    _format['url'] = update_url_query(media_url, {'hdnea3': hdnea2.value})
+            if OnceIE.suitable(_format['url']):
+                formats.extend(self._extract_once_formats(_format['url']))
+            else:
+                media_url = _format['url']
+                if determine_ext(media_url) == 'm3u8':
+                    hdnea2 = self._get_cookies(media_url).get('hdnea2')
+                    if hdnea2:
+                        _format['url'] = update_url_query(media_url, {'hdnea3': hdnea2.value})
 
-            formats.append(_format)
+                formats.append(_format)
 
         return formats, subtitles
 
@@ -125,7 +129,7 @@ class ThePlatformBaseIE(AdobePassIE):
         return self._parse_theplatform_metadata(info)
 
 
-class ThePlatformIE(ThePlatformBaseIE):
+class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
     _VALID_URL = r'''(?x)
         (?:https?://(?:link|player)\.theplatform\.com/[sp]/(?P<provider_id>[^/]+)/
            (?:(?:(?:[^/]+/)+select/)?(?P<media>media/(?:guid/\d+/)?)?|(?P<config>(?:[^/\?]+/(?:swf|config)|onsite)/select/))?

yt_dlp/extractor/twitch.py

@@ -187,7 +187,7 @@ class TwitchBaseIE(InfoExtractor):
             'url': thumbnail,
         }] if thumbnail else None
 
-    def _extract_twitch_m3u8_formats(self, path, video_id, token, signature, live_from_start=False):
+    def _extract_twitch_m3u8_formats(self, path, video_id, token, signature):
         formats = self._extract_m3u8_formats(
             f'{self._USHER_BASE}/{path}/{video_id}.m3u8', video_id, 'mp4', query={
                 'allow_source': 'true',
@@ -204,10 +204,7 @@ class TwitchBaseIE(InfoExtractor):
         for fmt in formats:
             if fmt.get('vcodec') and fmt['vcodec'].startswith('av01'):
                 # mpegts does not yet have proper support for av1
-                fmt.setdefault('downloader_options', {}).update({'ffmpeg_args_out': ['-f', 'mp4']})
-            if live_from_start:
-                fmt.setdefault('downloader_options', {}).update({'ffmpeg_args': ['-live_start_index', '0']})
-                fmt['is_from_start'] = True
+                fmt['downloader_options'] = {'ffmpeg_args_out': ['-f', 'mp4']}
 
         return formats
 
@@ -553,8 +550,7 @@ class TwitchVodIE(TwitchBaseIE):
         access_token = self._download_access_token(vod_id, 'video', 'id')
 
         formats = self._extract_twitch_m3u8_formats(
-            'vod', vod_id, access_token['value'], access_token['signature'],
-            live_from_start=self.get_param('live_from_start'))
+            'vod', vod_id, access_token['value'], access_token['signature'])
         formats.extend(self._extract_storyboard(vod_id, video.get('storyboard'), info.get('duration')))
 
         self._prefer_source(formats)
@@ -637,10 +633,6 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
     _PAGE_LIMIT = 100
 
     def _entries(self, channel_name, *args):
-        """
-        Subclasses must define _make_variables() and _extract_entry(),
-        as well as set _OPERATION_NAME, _ENTRY_KIND, _EDGE_KIND, and _NODE_KIND
-        """
         cursor = None
         variables_common = self._make_variables(channel_name, *args)
         entries_key = f'{self._ENTRY_KIND}s'
@@ -680,22 +672,7 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
                 break
 
 
-class TwitchVideosBaseIE(TwitchPlaylistBaseIE):
-    _OPERATION_NAME = 'FilterableVideoTower_Videos'
-    _ENTRY_KIND = 'video'
-    _EDGE_KIND = 'VideoEdge'
-    _NODE_KIND = 'Video'
-
-    @staticmethod
-    def _make_variables(channel_name, broadcast_type, sort):
-        return {
-            'channelOwnerLogin': channel_name,
-            'broadcastType': broadcast_type,
-            'videoSort': sort.upper(),
-        }
-
-
-class TwitchVideosIE(TwitchVideosBaseIE):
+class TwitchVideosIE(TwitchPlaylistBaseIE):
     _VALID_URL = r'https?://(?:(?:www|go|m)\.)?twitch\.tv/(?P<id>[^/]+)/(?:videos|profile)'
 
     _TESTS = [{
@@ -774,6 +751,11 @@ class TwitchVideosIE(TwitchVideosBaseIE):
         'views': 'Popular',
     }
 
+    _OPERATION_NAME = 'FilterableVideoTower_Videos'
+    _ENTRY_KIND = 'video'
+    _EDGE_KIND = 'VideoEdge'
+    _NODE_KIND = 'Video'
+
     @classmethod
     def suitable(cls, url):
         return (False
@@ -782,6 +764,14 @@ class TwitchVideosIE(TwitchVideosBaseIE):
                     TwitchVideosCollectionsIE))
                 else super().suitable(url))
 
+    @staticmethod
+    def _make_variables(channel_name, broadcast_type, sort):
+        return {
+            'channelOwnerLogin': channel_name,
+            'broadcastType': broadcast_type,
+            'videoSort': sort.upper(),
+        }
+
     @staticmethod
     def _extract_entry(node):
         return _make_video_result(node)
@@ -929,7 +919,7 @@ class TwitchVideosCollectionsIE(TwitchPlaylistBaseIE):
             playlist_title=f'{channel_name} - Collections')
 
 
-class TwitchStreamIE(TwitchVideosBaseIE):
+class TwitchStreamIE(TwitchBaseIE):
     IE_NAME = 'twitch:stream'
     _VALID_URL = r'''(?x)
                     https?://
@@ -992,7 +982,6 @@ class TwitchStreamIE(TwitchVideosBaseIE):
             'skip_download': 'Livestream',
         },
     }]
-    _PAGE_LIMIT = 1
 
     @classmethod
     def suitable(cls, url):
@@ -1006,20 +995,6 @@ class TwitchStreamIE(TwitchVideosBaseIE):
                     TwitchClipsIE))
                 else super().suitable(url))
 
-    @staticmethod
-    def _extract_entry(node):
-        if not isinstance(node, dict) or not node.get('id'):
-            return None
-        video_id = node['id']
-        return {
-            '_type': 'url',
-            'ie_key': TwitchVodIE.ie_key(),
-            'id': 'v' + video_id,
-            'url': f'https://www.twitch.tv/videos/{video_id}',
-            'title': node.get('title'),
-            'timestamp': unified_timestamp(node.get('publishedAt')) or 0,
-        }
-
     def _real_extract(self, url):
         channel_name = self._match_id(url).lower()
 
@@ -1054,16 +1029,6 @@ class TwitchStreamIE(TwitchVideosBaseIE):
         if not stream:
             raise UserNotLive(video_id=channel_name)
 
-        timestamp = unified_timestamp(stream.get('createdAt'))
-
-        if self.get_param('live_from_start'):
-            self.to_screen(f'{channel_name}: Extracting VOD to download live from start')
-            entry = next(self._entries(channel_name, None, 'time'), None)
-            if entry and entry.pop('timestamp') >= (timestamp or float('inf')):
-                return entry
-            self.report_warning(
-                'Unable to extract the VOD associated with this livestream', video_id=channel_name)
-
         access_token = self._download_access_token(
             channel_name, 'stream', 'channelName')
 
@@ -1073,6 +1038,7 @@ class TwitchStreamIE(TwitchVideosBaseIE):
         self._prefer_source(formats)
 
         view_count = stream.get('viewers')
+        timestamp = unified_timestamp(stream.get('createdAt'))
 
         sq_user = try_get(gql, lambda x: x[1]['data']['user'], dict) or {}
         uploader = sq_user.get('displayName')

yt_dlp/extractor/twitter.py

@@ -1342,7 +1342,7 @@ class TwitterIE(TwitterBaseIE):
                     'tweet_mode': 'extended',
                 })
         except ExtractorError as e:
-            if not isinstance(e.cause, HTTPError) or e.cause.status != 429:
+            if not isinstance(e.cause, HTTPError) or not e.cause.status == 429:
                 raise
             self.report_warning('Rate-limit exceeded; falling back to syndication endpoint')
             status = self._call_syndication_api(twid)

yt_dlp/extractor/vimeo.py

@@ -3,7 +3,6 @@ import functools
 import itertools
 import json
 import re
-import time
 import urllib.parse
 
 from .common import InfoExtractor
@@ -14,12 +13,10 @@ from ..utils import (
     OnDemandPagedList,
     clean_html,
     determine_ext,
-    filter_dict,
     get_element_by_class,
     int_or_none,
     join_nonempty,
     js_to_json,
-    jwt_decode_hs256,
     merge_dicts,
     parse_filesize,
     parse_iso8601,
@@ -42,9 +39,6 @@ class VimeoBaseInfoExtractor(InfoExtractor):
     _NETRC_MACHINE = 'vimeo'
     _LOGIN_REQUIRED = False
     _LOGIN_URL = 'https://vimeo.com/log_in'
-    _REFERER_HINT = (
-        'Cannot download embed-only video without embedding URL. Please call yt-dlp '
-        'with the URL of the page that embeds this video.')
     _IOS_CLIENT_AUTH = 'MTMxNzViY2Y0NDE0YTQ5YzhjZTc0YmU0NjVjNDQxYzNkYWVjOWRlOTpHKzRvMmgzVUh4UkxjdU5FRW80cDNDbDhDWGR5dVJLNUJZZ055dHBHTTB4V1VzaG41bEx1a2hiN0NWYWNUcldSSW53dzRUdFRYZlJEZmFoTTArOTBUZkJHS3R4V2llYU04Qnl1bERSWWxUdXRidjNqR2J4SHFpVmtFSUcyRktuQw=='
     _IOS_CLIENT_HEADERS = {
         'Accept': 'application/vnd.vimeo.*+json; version=3.4.10',
@@ -53,7 +47,6 @@ class VimeoBaseInfoExtractor(InfoExtractor):
     }
     _IOS_OAUTH_CACHE_KEY = 'oauth-token-ios'
     _ios_oauth_token = None
-    _viewer_info = None
 
     @staticmethod
     def _smuggle_referrer(url, referrer_url):
@@ -67,21 +60,8 @@ class VimeoBaseInfoExtractor(InfoExtractor):
             headers['Referer'] = data['referer']
         return url, data, headers
 
-    def _jwt_is_expired(self, token):
-        return jwt_decode_hs256(token)['exp'] - time.time() < 120
-
-    def _fetch_viewer_info(self, display_id=None, fatal=True):
-        if self._viewer_info and not self._jwt_is_expired(self._viewer_info['jwt']):
-            return self._viewer_info
-
-        self._viewer_info = self._download_json(
-            'https://vimeo.com/_next/viewer', display_id, 'Downloading web token info',
-            'Failed to download web token info', fatal=fatal, headers={'Accept': 'application/json'})
-
-        return self._viewer_info
-
     def _perform_login(self, username, password):
-        viewer = self._fetch_viewer_info()
+        viewer = self._download_json('https://vimeo.com/_next/viewer', None, 'Downloading login token')
         data = {
             'action': 'login',
             'email': username,
@@ -116,10 +96,11 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                 expected=True)
         return password
 
-    def _verify_video_password(self, video_id, path=None):
+    def _verify_video_password(self, video_id):
         video_password = self._get_video_password()
-        token = self._fetch_viewer_info(video_id)['xsrft']
-        url = join_nonempty('https://vimeo.com', path, video_id, delim='/')
+        token = self._download_json(
+            'https://vimeo.com/_next/viewer', video_id, 'Downloading viewer info')['xsrft']
+        url = f'https://vimeo.com/{video_id}'
         try:
             self._request_webpage(
                 f'{url}/password', video_id,
@@ -136,10 +117,6 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                 raise ExtractorError('Wrong password', expected=True)
             raise
 
-    def _extract_config_url(self, webpage, **kwargs):
-        return self._html_search_regex(
-            r'\bdata-config-url="([^"]+)"', webpage, 'config URL', **kwargs)
-
     def _extract_vimeo_config(self, webpage, video_id, *args, **kwargs):
         vimeo_config = self._search_regex(
             r'vimeo\.config\s*=\s*(?:({.+?})|_extend\([^,]+,\s+({.+?})\));',
@@ -187,7 +164,6 @@ class VimeoBaseInfoExtractor(InfoExtractor):
         sep_pattern = r'/sep/video/'
         for files_type in ('hls', 'dash'):
             for cdn_name, cdn_data in (try_get(config_files, lambda x: x[files_type]['cdns']) or {}).items():
-                # TODO: Also extract 'avc_url'? Investigate if there are 'hevc_url', 'av1_url'?
                 manifest_url = cdn_data.get('url')
                 if not manifest_url:
                     continue
@@ -268,10 +244,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
             'formats': formats,
             'subtitles': subtitles,
             'live_status': live_status,
-            'release_timestamp': traverse_obj(live_event, ('ingest', (
-                ('scheduled_start_time', {parse_iso8601}),
-                ('start_time', {int_or_none}),
-            ), any)),
+            'release_timestamp': traverse_obj(live_event, ('ingest', 'scheduled_start_time', {parse_iso8601})),
             # Note: Bitrates are completely broken. Single m3u8 may contain entries in kbps and bps
             # at the same time without actual units specified.
             '_format_sort_fields': ('quality', 'res', 'fps', 'hdr:12', 'source'),
@@ -380,7 +353,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
                          (?:
                              (?P<u>user)|
                              (?!(?:channels|album|showcase)/[^/?#]+/?(?:$|[?#])|[^/]+/review/|ondemand/)
-                             (?:(?!event/).*?/)??
+                             (?:.*?/)??
                              (?P<q>
                                  (?:
                                      play_redirect_hls|
@@ -960,7 +933,8 @@ class VimeoIE(VimeoBaseInfoExtractor):
             r'vimeo\.com/(?:album|showcase)/([^/]+)', url, 'album id', default=None)
         if not album_id:
             return
-        viewer = self._fetch_viewer_info(album_id, fatal=False)
+        viewer = self._download_json(
+            'https://vimeo.com/_rv/viewer', album_id, fatal=False)
         if not viewer:
             webpage = self._download_webpage(url, album_id)
             viewer = self._parse_json(self._search_regex(
@@ -1018,7 +992,9 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 raise
             errmsg = error.cause.response.read()
             if b'Because of its privacy settings, this video cannot be played here' in errmsg:
-                raise ExtractorError(self._REFERER_HINT, expected=True)
+                raise ExtractorError(
+                    'Cannot download embed-only video without embedding URL. Please call yt-dlp '
+                    'with the URL of the page that embeds this video.', expected=True)
             # 403 == vimeo.com TLS fingerprint or DC IP block; 429 == player.vimeo.com TLS FP block
             status = error.cause.status
             dcip_msg = 'If you are using a data center IP or VPN/proxy, your IP may be blocked'
@@ -1063,7 +1039,8 @@ class VimeoIE(VimeoBaseInfoExtractor):
         channel_id = self._search_regex(
             r'vimeo\.com/channels/([^/]+)', url, 'channel id', default=None)
         if channel_id:
-            config_url = self._extract_config_url(webpage, default=None)
+            config_url = self._html_search_regex(
+                r'\bdata-config-url="([^"]+)"', webpage, 'config URL', default=None)
             video_description = clean_html(get_element_by_class('description', webpage))
             info_dict.update({
                 'channel_id': channel_id,
@@ -1356,7 +1333,8 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
 
     def _real_extract(self, url):
         album_id = self._match_id(url)
-        viewer = self._fetch_viewer_info(album_id, fatal=False)
+        viewer = self._download_json(
+            'https://vimeo.com/_rv/viewer', album_id, fatal=False)
         if not viewer:
             webpage = self._download_webpage(url, album_id)
             viewer = self._parse_json(self._search_regex(
@@ -1648,377 +1626,3 @@ class VimeoProIE(VimeoBaseInfoExtractor):
 
         return self.url_result(vimeo_url, VimeoIE, video_id, url_transparent=True,
                                description=description)
-
-
-class VimeoEventIE(VimeoBaseInfoExtractor):
-    IE_NAME = 'vimeo:event'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?vimeo\.com/event/(?P<id>\d+)(?:/
-            (?:
-                (?:embed/)?(?P<unlisted_hash>[\da-f]{10})|
-                videos/(?P<video_id>\d+)
-            )
-        )?'''
-    _EMBED_REGEX = [r'<iframe\b[^>]+\bsrc=["\'](?P<url>https?://vimeo\.com/event/\d+/embed(?:[/?][^"\']*)?)["\'][^>]*>']
-    _TESTS = [{
-        # stream_privacy.view: 'anybody'
-        'url': 'https://vimeo.com/event/5116195',
-        'info_dict': {
-            'id': '1082194134',
-            'ext': 'mp4',
-            'display_id': '5116195',
-            'title': 'Skidmore College Commencement 2025',
-            'description': 'md5:1902dd5165d21f98aa198297cc729d23',
-            'uploader': 'Skidmore College',
-            'uploader_id': 'user116066434',
-            'uploader_url': 'https://vimeo.com/user116066434',
-            'comment_count': int,
-            'like_count': int,
-            'duration': 9810,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'timestamp': 1747502974,
-            'upload_date': '20250517',
-            'release_timestamp': 1747502998,
-            'release_date': '20250517',
-            'live_status': 'was_live',
-        },
-        'params': {'skip_download': 'm3u8'},
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }, {
-        # stream_privacy.view: 'embed_only'
-        'url': 'https://vimeo.com/event/5034253/embed',
-        'info_dict': {
-            'id': '1071439154',
-            'ext': 'mp4',
-            'display_id': '5034253',
-            'title': 'Advancing Humans with AI',
-            'description': r're:AI is here to stay, but how do we ensure that people flourish in a world of pervasive AI use.{322}$',
-            'uploader': 'MIT Media Lab',
-            'uploader_id': 'mitmedialab',
-            'uploader_url': 'https://vimeo.com/mitmedialab',
-            'duration': 23235,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'chapters': 'count:37',
-            'release_timestamp': 1744290000,
-            'release_date': '20250410',
-            'live_status': 'was_live',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-            'http_headers': {'Referer': 'https://www.media.mit.edu/events/aha-symposium/'},
-        },
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }, {
-        # Last entry on 2nd page of the 37 video playlist, but use clip_to_play_id API param shortcut
-        'url': 'https://vimeo.com/event/4753126/videos/1046153257',
-        'info_dict': {
-            'id': '1046153257',
-            'ext': 'mp4',
-            'display_id': '4753126',
-            'title': 'January 12, 2025 The True Vine (Pastor John Mindrup)',
-            'description': 'The True Vine (Pastor \tJohn Mindrup)',
-            'uploader': 'Salem United Church of Christ',
-            'uploader_id': 'user230181094',
-            'uploader_url': 'https://vimeo.com/user230181094',
-            'comment_count': int,
-            'like_count': int,
-            'duration': 4962,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'timestamp': 1736702464,
-            'upload_date': '20250112',
-            'release_timestamp': 1736702543,
-            'release_date': '20250112',
-            'live_status': 'was_live',
-        },
-        'params': {'skip_download': 'm3u8'},
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }, {
-        # "24/7" livestream
-        'url': 'https://vimeo.com/event/4768062',
-        'info_dict': {
-            'id': '1079901414',
-            'ext': 'mp4',
-            'display_id': '4768062',
-            'title': r're:GRACELAND CAM \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
-            'description': '24/7 camera at Graceland Mansion',
-            'uploader': 'Elvis Presley\'s Graceland',
-            'uploader_id': 'visitgraceland',
-            'uploader_url': 'https://vimeo.com/visitgraceland',
-            'release_timestamp': 1745975450,
-            'release_date': '20250430',
-            'live_status': 'is_live',
-        },
-        'params': {'skip_download': 'livestream'},
-    }, {
-        # stream_privacy.view: 'unlisted' with unlisted_hash in URL path (stream_privacy.embed: 'whitelist')
-        'url': 'https://vimeo.com/event/4259978/3db517c479',
-        'info_dict': {
-            'id': '939104114',
-            'ext': 'mp4',
-            'display_id': '4259978',
-            'title': 'Enhancing Credibility in Your Community Science Project',
-            'description': 'md5:eab953341168b9c146bc3cfe3f716070',
-            'uploader': 'NOAA Research',
-            'uploader_id': 'noaaresearch',
-            'uploader_url': 'https://vimeo.com/noaaresearch',
-            'comment_count': int,
-            'like_count': int,
-            'duration': 3961,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'timestamp': 1716408008,
-            'upload_date': '20240522',
-            'release_timestamp': 1716408062,
-            'release_date': '20240522',
-            'live_status': 'was_live',
-        },
-        'params': {'skip_download': 'm3u8'},
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }, {
-        # "done" event with video_id in URL and unlisted_hash in VimeoIE URL
-        'url': 'https://vimeo.com/event/595460/videos/498149131/',
-        'info_dict': {
-            'id': '498149131',
-            'ext': 'mp4',
-            'display_id': '595460',
-            'title': '2021 Eighth Annual John Cardinal Foley Lecture on Social Communications',
-            'description': 'Replay: https://vimeo.com/catholicphilly/review/498149131/544f26a12f',
-            'uploader': 'Kearns Media Consulting LLC',
-            'uploader_id': 'kearnsmediaconsulting',
-            'uploader_url': 'https://vimeo.com/kearnsmediaconsulting',
-            'comment_count': int,
-            'like_count': int,
-            'duration': 4466,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'timestamp': 1612228466,
-            'upload_date': '20210202',
-            'release_timestamp': 1612228538,
-            'release_date': '20210202',
-            'live_status': 'was_live',
-        },
-        'params': {'skip_download': 'm3u8'},
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }, {
-        # stream_privacy.view: 'password'; stream_privacy.embed: 'public'
-        'url': 'https://vimeo.com/event/4940578',
-        'info_dict': {
-            'id': '1059263570',
-            'ext': 'mp4',
-            'display_id': '4940578',
-            'title': 'TMAC AKC AGILITY 2-22-2025',
-            'uploader': 'Paws \'N Effect',
-            'uploader_id': 'pawsneffect',
-            'uploader_url': 'https://vimeo.com/pawsneffect',
-            'comment_count': int,
-            'like_count': int,
-            'duration': 33115,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'timestamp': 1740261836,
-            'upload_date': '20250222',
-            'release_timestamp': 1740261873,
-            'release_date': '20250222',
-            'live_status': 'was_live',
-        },
-        'params': {
-            'videopassword': '22',
-            'skip_download': 'm3u8',
-        },
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }, {
-        # API serves a playlist of 37 videos, but the site only streams the newest one (changes every Sunday)
-        'url': 'https://vimeo.com/event/4753126',
-        'only_matching': True,
-    }, {
-        # Scheduled for 2025.05.15 but never started; "unavailable"; stream_privacy.view: "anybody"
-        'url': 'https://vimeo.com/event/5120811/embed',
-        'only_matching': True,
-    }, {
-        'url': 'https://vimeo.com/event/5112969/embed?muted=1',
-        'only_matching': True,
-    }, {
-        'url': 'https://vimeo.com/event/5097437/embed/interaction?muted=1',
-        'only_matching': True,
-    }, {
-        'url': 'https://vimeo.com/event/5113032/embed?autoplay=1&muted=1',
-        'only_matching': True,
-    }, {
-        # Ended livestream with video_id
-        'url': 'https://vimeo.com/event/595460/videos/507329569/',
-        'only_matching': True,
-    }, {
-        # stream_privacy.view: 'unlisted' with unlisted_hash in URL path (stream_privacy.embed: 'public')
-        'url': 'https://vimeo.com/event/4606123/embed/358d60ce2e',
-        'only_matching': True,
-    }]
-    _WEBPAGE_TESTS = [{
-        # Same result as https://vimeo.com/event/5034253/embed
-        'url': 'https://www.media.mit.edu/events/aha-symposium/',
-        'info_dict': {
-            'id': '1071439154',
-            'ext': 'mp4',
-            'display_id': '5034253',
-            'title': 'Advancing Humans with AI',
-            'description': r're:AI is here to stay, but how do we ensure that people flourish in a world of pervasive AI use.{322}$',
-            'uploader': 'MIT Media Lab',
-            'uploader_id': 'mitmedialab',
-            'uploader_url': 'https://vimeo.com/mitmedialab',
-            'duration': 23235,
-            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
-            'chapters': 'count:37',
-            'release_timestamp': 1744290000,
-            'release_date': '20250410',
-            'live_status': 'was_live',
-        },
-        'params': {'skip_download': 'm3u8'},
-        'expected_warnings': ['Failed to parse XML: not well-formed'],
-    }]
-
-    _EVENT_FIELDS = (
-        'title', 'uri', 'schedule', 'stream_description', 'stream_privacy.embed', 'stream_privacy.view',
-        'clip_to_play.name', 'clip_to_play.uri', 'clip_to_play.config_url', 'clip_to_play.live.status',
-        'clip_to_play.privacy.embed', 'clip_to_play.privacy.view', 'clip_to_play.password',
-        'streamable_clip.name', 'streamable_clip.uri', 'streamable_clip.config_url', 'streamable_clip.live.status',
-    )
-    _VIDEOS_FIELDS = ('items', 'uri', 'name', 'config_url', 'duration', 'live.status')
-
-    def _call_events_api(
-        self, event_id, ep=None, unlisted_hash=None, note=None,
-        fields=(), referrer=None, query=None, headers=None,
-    ):
-        resource = join_nonempty('event', ep, note, 'API JSON', delim=' ')
-
-        return self._download_json(
-            join_nonempty(
-                'https://api.vimeo.com/live_events',
-                join_nonempty(event_id, unlisted_hash, delim=':'), ep, delim='/'),
-            event_id, f'Downloading {resource}', f'Failed to download {resource}',
-            query=filter_dict({
-                'fields': ','.join(fields) or [],
-                # Correct spelling with 4 R's is deliberate
-                'referrer': referrer,
-                **(query or {}),
-            }), headers=filter_dict({
-                'Accept': 'application/json',
-                'Authorization': f'jwt {self._fetch_viewer_info(event_id)["jwt"]}',
-                'Referer': referrer,
-                **(headers or {}),
-            }))
-
-    @staticmethod
-    def _extract_video_id_and_unlisted_hash(video):
-        if not traverse_obj(video, ('uri', {lambda x: x.startswith('/videos/')})):
-            return None, None
-        video_id, _, unlisted_hash = video['uri'][8:].partition(':')
-        return video_id, unlisted_hash or None
-
-    def _vimeo_url_result(self, video_id, unlisted_hash=None, event_id=None):
-        # VimeoIE can extract more metadata and formats for was_live event videos
-        return self.url_result(
-            join_nonempty('https://vimeo.com', video_id, unlisted_hash, delim='/'), VimeoIE,
-            video_id, display_id=event_id, live_status='was_live', url_transparent=True)
-
-    @classmethod
-    def _extract_embed_urls(cls, url, webpage):
-        for embed_url in super()._extract_embed_urls(url, webpage):
-            yield cls._smuggle_referrer(embed_url, url)
-
-    def _real_extract(self, url):
-        url, _, headers = self._unsmuggle_headers(url)
-        # XXX: Keep key name in sync with _unsmuggle_headers
-        referrer = headers.get('Referer')
-        event_id, unlisted_hash, video_id = self._match_valid_url(url).group('id', 'unlisted_hash', 'video_id')
-
-        for retry in (False, True):
-            try:
-                live_event_data = self._call_events_api(
-                    event_id, unlisted_hash=unlisted_hash, fields=self._EVENT_FIELDS,
-                    referrer=referrer, query={'clip_to_play_id': video_id or '0'},
-                    headers={'Accept': 'application/vnd.vimeo.*+json;version=3.4.9'})
-                break
-            except ExtractorError as e:
-                if retry or not isinstance(e.cause, HTTPError) or e.cause.status not in (400, 403):
-                    raise
-                response = traverse_obj(e.cause.response.read(), ({json.loads}, {dict})) or {}
-                error_code = response.get('error_code')
-                if error_code == 2204:
-                    self._verify_video_password(event_id, path='event')
-                    continue
-                if error_code == 3200:
-                    raise ExtractorError(self._REFERER_HINT, expected=True)
-                if error_msg := response.get('error'):
-                    raise ExtractorError(f'Vimeo says: {error_msg}', expected=True)
-                raise
-
-        # stream_privacy.view can be: 'anybody', 'embed_only', 'nobody', 'password', 'unlisted'
-        view_policy = live_event_data['stream_privacy']['view']
-        if view_policy == 'nobody':
-            raise ExtractorError('This event has not been made available to anyone', expected=True)
-
-        clip_data = traverse_obj(live_event_data, ('clip_to_play', {dict})) or {}
-        # live.status can be: 'streaming' (is_live), 'done' (was_live), 'unavailable' (is_upcoming OR dead)
-        clip_status = traverse_obj(clip_data, ('live', 'status', {str}))
-        start_time = traverse_obj(live_event_data, ('schedule', 'start_time', {str}))
-        release_timestamp = parse_iso8601(start_time)
-
-        if clip_status == 'unavailable' and release_timestamp and release_timestamp > time.time():
-            self.raise_no_formats(f'This live event is scheduled for {start_time}', expected=True)
-            live_status = 'is_upcoming'
-            config_url = None
-
-        elif view_policy == 'embed_only':
-            webpage = self._download_webpage(
-                join_nonempty('https://vimeo.com/event', event_id, 'embed', unlisted_hash, delim='/'),
-                event_id, 'Downloading embed iframe webpage', impersonate=True, headers=headers)
-            # The _parse_config result will overwrite live_status w/ 'is_live' if livestream is active
-            live_status = 'was_live'
-            config_url = self._extract_config_url(webpage)
-
-        else:  # view_policy in ('anybody', 'password', 'unlisted')
-            if video_id:
-                clip_id, clip_hash = self._extract_video_id_and_unlisted_hash(clip_data)
-                if video_id == clip_id and clip_status == 'done' and (clip_hash or view_policy != 'unlisted'):
-                    return self._vimeo_url_result(clip_id, clip_hash, event_id)
-
-                video_filter = lambda _, v: self._extract_video_id_and_unlisted_hash(v)[0] == video_id
-            else:
-                video_filter = lambda _, v: v['live']['status'] in ('streaming', 'done')
-
-            for page in itertools.count(1):
-                videos_data = self._call_events_api(
-                    event_id, 'videos', unlisted_hash=unlisted_hash, note=f'page {page}',
-                    fields=self._VIDEOS_FIELDS, referrer=referrer, query={'page': page},
-                    headers={'Accept': 'application/vnd.vimeo.*;version=3.4.1'})
-
-                video = traverse_obj(videos_data, ('data', video_filter, any))
-                if video or not traverse_obj(videos_data, ('paging', 'next', {str})):
-                    break
-
-            live_status = {
-                'streaming': 'is_live',
-                'done': 'was_live',
-            }.get(traverse_obj(video, ('live', 'status', {str})))
-
-            if not live_status:  # requested video_id is unavailable or no videos are available
-                raise ExtractorError('This event video is unavailable', expected=True)
-            elif live_status == 'was_live':
-                return self._vimeo_url_result(*self._extract_video_id_and_unlisted_hash(video), event_id)
-            config_url = video['config_url']
-
-        if config_url:  # view_policy == 'embed_only' or live_status == 'is_live'
-            info = filter_dict(self._parse_config(
-                self._download_json(config_url, event_id, 'Downloading config JSON'), event_id))
-        else:  # live_status == 'is_upcoming'
-            info = {'id': event_id}
-
-        if info.get('live_status') == 'post_live':
-            self.report_warning('This live event recently ended and some formats may not yet be available')
-
-        return {
-            **traverse_obj(live_event_data, {
-                'title': ('title', {str}),
-                'description': ('stream_description', {str}),
-            }),
-            'display_id': event_id,
-            'live_status': live_status,
-            'release_timestamp': release_timestamp,
-            **info,
-        }

yt_dlp/extractor/voxmedia.py

@@ -1,6 +1,7 @@
 import urllib.parse
 
 from .common import InfoExtractor
+from .once import OnceIE
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -9,7 +10,7 @@ from ..utils import (
 )
 
 
-class VoxMediaVolumeIE(InfoExtractor):
+class VoxMediaVolumeIE(OnceIE):
     _VALID_URL = r'https?://volume\.vox-cdn\.com/embed/(?P<id>[0-9a-f]{9})'
 
     def _real_extract(self, url):
@@ -56,8 +57,7 @@ class VoxMediaVolumeIE(InfoExtractor):
             if not provider_video_id:
                 continue
             if provider_video_type == 'brightcove':
-                # TODO: Find embed example or confirm that Vox has stopped using Brightcove
-                raise ExtractorError('Vox Brightcove embeds are currently unsupported')
+                info['formats'] = self._extract_once_formats(provider_video_id)
             else:
                 info.update({
                     '_type': 'url_transparent',
@@ -155,6 +155,20 @@ class VoxMediaIE(InfoExtractor):
             },
         }],
         'skip': 'Page no longer contain videos',
+    }, {
+        # volume embed, Brightcove Once
+        'url': 'https://www.recode.net/2014/6/17/11628066/post-post-pc-ceo-the-full-code-conference-video-of-microsofts-satya',
+        'md5': '2dbc77b8b0bff1894c2fce16eded637d',
+        'info_dict': {
+            'id': '1231c973d',
+            'ext': 'mp4',
+            'title': 'Post-Post-PC CEO: The Full Code Conference Video of Microsoft\'s Satya Nadella',
+            'description': 'The longtime veteran was chosen earlier this year as the software giant\'s third leader in its history.',
+            'timestamp': 1402938000,
+            'upload_date': '20140616',
+            'duration': 4114,
+        },
+        'add_ie': ['VoxMediaVolume'],
     }]
 
     def _real_extract(self, url):

yt_dlp/extractor/xinpianchang.py

@@ -45,7 +45,7 @@ class XinpianchangIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id=video_id, headers={'Referer': url})
+        webpage = self._download_webpage(url, video_id=video_id)
         video_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['detail']['video']
 
         data = self._download_json(

yt_dlp/extractor/youtube/_base.py

@@ -35,7 +35,6 @@ from ...utils import (
 class _PoTokenContext(enum.Enum):
     PLAYER = 'player'
     GVS = 'gvs'
-    SUBS = 'subs'
 
 
 # any clients starting with _ cannot be explicitly requested by the user
@@ -788,7 +787,6 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
 
     def _download_ytcfg(self, client, video_id):
         url = {
-            'mweb': 'https://m.youtube.com',
             'web': 'https://www.youtube.com',
             'web_music': 'https://music.youtube.com',
             'web_embedded': f'https://www.youtube.com/embed/{video_id}?html5=1',

yt_dlp/extractor/youtube/_video.py

@@ -72,9 +72,6 @@ from ...utils.networking import clean_headers, clean_proxies, select_proxy
 
 STREAMING_DATA_CLIENT_NAME = '__yt_dlp_client'
 STREAMING_DATA_INITIAL_PO_TOKEN = '__yt_dlp_po_token'
-STREAMING_DATA_FETCH_SUBS_PO_TOKEN = '__yt_dlp_fetch_subs_po_token'
-STREAMING_DATA_INNERTUBE_CONTEXT = '__yt_dlp_innertube_context'
-
 PO_TOKEN_GUIDE_URL = 'https://github.com/yt-dlp/yt-dlp/wiki/PO-Token-Guide'
 
 
@@ -2866,8 +2863,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 continue
 
     def fetch_po_token(self, client='web', context=_PoTokenContext.GVS, ytcfg=None, visitor_data=None,
-                       data_sync_id=None, session_index=None, player_url=None, video_id=None, webpage=None,
-                       required=False, **kwargs):
+                       data_sync_id=None, session_index=None, player_url=None, video_id=None, webpage=None, **kwargs):
         """
         Fetch a PO Token for a given client and context. This function will validate required parameters for a given context and client.
 
@@ -2882,7 +2878,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         @param player_url: player URL.
         @param video_id: video ID.
         @param webpage: video webpage.
-        @param required: Whether the PO Token is required (i.e. try to fetch unless policy is "never").
         @param kwargs: Additional arguments to pass down. May be more added in the future.
         @return: The fetched PO Token. None if it could not be fetched.
         """
@@ -2931,7 +2926,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             player_url=player_url,
             video_id=video_id,
             video_webpage=webpage,
-            required=required,
             **kwargs,
         )
 
@@ -2951,7 +2945,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             or (
                 fetch_pot_policy == 'auto'
                 and _PoTokenContext(context) not in self._get_default_ytcfg(client)['PO_TOKEN_REQUIRED_CONTEXTS']
-                and not kwargs.get('required', False)
             )
         ):
             return None
@@ -3140,8 +3133,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 player_url = self._download_player_url(video_id)
                 tried_iframe_fallback = True
 
-            pr = initial_pr if client == 'web' else None
-
             visitor_data = visitor_data or self._extract_visitor_data(master_ytcfg, initial_pr, player_ytcfg)
             data_sync_id = data_sync_id or self._extract_data_sync_id(master_ytcfg, initial_pr, player_ytcfg)
 
@@ -3156,19 +3147,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'ytcfg': player_ytcfg or self._get_default_ytcfg(client),
             }
 
-            # Don't need a player PO token for WEB if using player response from webpage
-            player_po_token = None if pr else self.fetch_po_token(
+            player_po_token = self.fetch_po_token(
                 context=_PoTokenContext.PLAYER, **fetch_po_token_args)
 
             gvs_po_token = self.fetch_po_token(
                 context=_PoTokenContext.GVS, **fetch_po_token_args)
 
-            fetch_subs_po_token_func = functools.partial(
-                self.fetch_po_token,
-                context=_PoTokenContext.SUBS,
-                **fetch_po_token_args,
-            )
-
             required_pot_contexts = self._get_default_ytcfg(client)['PO_TOKEN_REQUIRED_CONTEXTS']
 
             if (
@@ -3195,6 +3179,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                     only_once=True)
                 deprioritize_pr = True
 
+            pr = initial_pr if client == 'web' else None
             try:
                 pr = pr or self._extract_player_response(
                     client, video_id,
@@ -3212,13 +3197,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             if pr_id := self._invalid_player_response(pr, video_id):
                 skipped_clients[client] = pr_id
             elif pr:
-                # Save client details for introspection later
-                innertube_context = traverse_obj(player_ytcfg or self._get_default_ytcfg(client), 'INNERTUBE_CONTEXT')
-                sd = pr.setdefault('streamingData', {})
+                # Save client name for introspection later
+                sd = traverse_obj(pr, ('streamingData', {dict})) or {}
                 sd[STREAMING_DATA_CLIENT_NAME] = client
                 sd[STREAMING_DATA_INITIAL_PO_TOKEN] = gvs_po_token
-                sd[STREAMING_DATA_INNERTUBE_CONTEXT] = innertube_context
-                sd[STREAMING_DATA_FETCH_SUBS_PO_TOKEN] = fetch_subs_po_token_func
                 for f in traverse_obj(sd, (('formats', 'adaptiveFormats'), ..., {dict})):
                     f[STREAMING_DATA_CLIENT_NAME] = client
                     f[STREAMING_DATA_INITIAL_PO_TOKEN] = gvs_po_token
@@ -3280,25 +3262,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         else:
             self.report_warning(msg, only_once=True)
 
-    def _report_pot_subtitles_skipped(self, video_id, client_name, msg=None):
-        msg = msg or (
-            f'{video_id}: Some {client_name} client subtitles require a PO Token which was not provided. '
-            'They will be discarded since they are not downloadable as-is. '
-            f'You can manually pass a Subtitles PO Token for this client with '
-            f'--extractor-args "youtube:po_token={client_name}.subs+XXX" . '
-            f'For more information, refer to  {PO_TOKEN_GUIDE_URL}')
-
-        subs_wanted = any((
-            self.get_param('writesubtitles'),
-            self.get_param('writeautomaticsub'),
-            self.get_param('listsubtitles')))
-
-        # Only raise a warning for non-default clients, to not confuse users.
-        if not subs_wanted or client_name in (*self._DEFAULT_CLIENTS, *self._DEFAULT_AUTHED_CLIENTS):
-            self.write_debug(msg, only_once=True)
-        else:
-            self.report_warning(msg, only_once=True)
-
     def _extract_formats_and_subtitles(self, streaming_data, video_id, player_url, live_status, duration):
         CHUNK_SIZE = 10 << 20
         PREFERRED_LANG_VALUE = 10
@@ -3590,9 +3553,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                     hls_manifest_url = hls_manifest_url.rstrip('/') + f'/pot/{po_token}'
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(
                     hls_manifest_url, video_id, 'mp4', fatal=False, live=live_status == 'is_live')
-                for sub in traverse_obj(subs, (..., ..., {dict})):
-                    # HLS subs (m3u8) do not need a PO token; save client name for debugging
-                    sub[STREAMING_DATA_CLIENT_NAME] = client_name
                 subtitles = self._merge_subtitles(subs, subtitles)
                 for f in fmts:
                     if process_manifest_format(f, 'hls', client_name, self._search_regex(
@@ -3604,9 +3564,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 if po_token:
                     dash_manifest_url = dash_manifest_url.rstrip('/') + f'/pot/{po_token}'
                 formats, subs = self._extract_mpd_formats_and_subtitles(dash_manifest_url, video_id, fatal=False)
-                for sub in traverse_obj(subs, (..., ..., {dict})):
-                    # TODO: Investigate if DASH subs ever need a PO token; save client name for debugging
-                    sub[STREAMING_DATA_CLIENT_NAME] = client_name
                 subtitles = self._merge_subtitles(subs, subtitles)  # Prioritize HLS subs over DASH
                 for f in formats:
                     if process_manifest_format(f, 'dash', client_name, f['format_id'], po_token):
@@ -3798,7 +3755,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             reason = self._get_text(pemr, 'reason') or get_first(playability_statuses, 'reason')
             subreason = clean_html(self._get_text(pemr, 'subreason') or '')
             if subreason:
-                if subreason.startswith('The uploader has not made this video available in your country'):
+                if subreason == 'The uploader has not made this video available in your country.':
                     countries = get_first(microformats, 'availableCountries')
                     if not countries:
                         regions_allowed = search_meta('regionsAllowed')
@@ -3933,81 +3890,47 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'quality', 'res', 'fps', 'hdr:12', 'source', 'vcodec', 'channels', 'acodec', 'lang', 'proto'),
         }
 
-        def get_lang_code(track):
-            return (remove_start(track.get('vssId') or '', '.').replace('.', '-')
-                    or track.get('languageCode'))
-
-        def process_language(container, base_url, lang_code, sub_name, client_name, query):
-            lang_subs = container.setdefault(lang_code, [])
-            for fmt in self._SUBTITLE_FORMATS:
-                query = {**query, 'fmt': fmt}
-                lang_subs.append({
-                    'ext': fmt,
-                    'url': urljoin('https://www.youtube.com', update_url_query(base_url, query)),
-                    'name': sub_name,
-                    STREAMING_DATA_CLIENT_NAME: client_name,
-                })
-
         subtitles = {}
-        skipped_subs_clients = set()
-        prs = traverse_obj(player_responses, (
-            # Filter out initial_pr which does not have streamingData (smuggled client context)
-            lambda _, v: v['streamingData'] and v['captions']['playerCaptionsTracklistRenderer']))
+        pctr = traverse_obj(player_responses, (..., 'captions', 'playerCaptionsTracklistRenderer'), expected_type=dict)
+        if pctr:
+            def get_lang_code(track):
+                return (remove_start(track.get('vssId') or '', '.').replace('.', '-')
+                        or track.get('languageCode'))
 
-        pctrs = traverse_obj(prs, (..., 'captions', 'playerCaptionsTracklistRenderer', {dict}))
-        translation_languages = {
-            lang.get('languageCode'): self._get_text(lang.get('languageName'), max_runs=1)
-            for lang in traverse_obj(pctrs, (..., 'translationLanguages', ..., {dict}))}
-        # NB: Constructing the full subtitle dictionary is slow
-        get_translated_subs = 'translated_subs' not in self._configuration_arg('skip') and (
-            self.get_param('writeautomaticsub', False) or self.get_param('listsubtitles'))
+            # Converted into dicts to remove duplicates
+            captions = {
+                get_lang_code(sub): sub
+                for sub in traverse_obj(pctr, (..., 'captionTracks', ...))}
+            translation_languages = {
+                lang.get('languageCode'): self._get_text(lang.get('languageName'), max_runs=1)
+                for lang in traverse_obj(pctr, (..., 'translationLanguages', ...))}
 
-        all_captions = traverse_obj(pctrs, (..., 'captionTracks', ..., {dict}))
-        need_subs_langs = {get_lang_code(sub) for sub in all_captions if sub.get('kind') != 'asr'}
-        need_caps_langs = {
-            remove_start(get_lang_code(sub), 'a-')
-            for sub in all_captions if sub.get('kind') == 'asr'}
+            def process_language(container, base_url, lang_code, sub_name, query):
+                lang_subs = container.setdefault(lang_code, [])
+                for fmt in self._SUBTITLE_FORMATS:
+                    query.update({
+                        'fmt': fmt,
+                    })
+                    lang_subs.append({
+                        'ext': fmt,
+                        'url': urljoin('https://www.youtube.com', update_url_query(base_url, query)),
+                        'name': sub_name,
+                    })
 
-        for pr in prs:
-            pctr = pr['captions']['playerCaptionsTracklistRenderer']
-            client_name = pr['streamingData'][STREAMING_DATA_CLIENT_NAME]
-            innertube_client_name = pr['streamingData'][STREAMING_DATA_INNERTUBE_CONTEXT]['client']['clientName']
-            required_contexts = self._get_default_ytcfg(client_name)['PO_TOKEN_REQUIRED_CONTEXTS']
-            fetch_subs_po_token_func = pr['streamingData'][STREAMING_DATA_FETCH_SUBS_PO_TOKEN]
-
-            pot_params = {}
-            already_fetched_pot = False
-
-            for caption_track in traverse_obj(pctr, ('captionTracks', lambda _, v: v['baseUrl'])):
-                base_url = caption_track['baseUrl']
-                qs = parse_qs(base_url)
-                lang_code = get_lang_code(caption_track)
-                requires_pot = (
-                    # We can detect the experiment for now
-                    any(e in traverse_obj(qs, ('exp', ...)) for e in ('xpe', 'xpv'))
-                    or _PoTokenContext.SUBS in required_contexts)
-
-                if not already_fetched_pot:
-                    already_fetched_pot = True
-                    if subs_po_token := fetch_subs_po_token_func(required=requires_pot):
-                        pot_params.update({
-                            'pot': subs_po_token,
-                            'potc': '1',
-                            'c': innertube_client_name,
-                        })
-
-                if not pot_params and requires_pot:
-                    skipped_subs_clients.add(client_name)
-                    self._report_pot_subtitles_skipped(video_id, client_name)
-                    break
-
-                orig_lang = qs.get('lang', [None])[-1]
+            # NB: Constructing the full subtitle dictionary is slow
+            get_translated_subs = 'translated_subs' not in self._configuration_arg('skip') and (
+                self.get_param('writeautomaticsub', False) or self.get_param('listsubtitles'))
+            for lang_code, caption_track in captions.items():
+                base_url = caption_track.get('baseUrl')
+                orig_lang = parse_qs(base_url).get('lang', [None])[-1]
+                if not base_url:
+                    continue
                 lang_name = self._get_text(caption_track, 'name', max_runs=1)
                 if caption_track.get('kind') != 'asr':
                     if not lang_code:
                         continue
                     process_language(
-                        subtitles, base_url, lang_code, lang_name, client_name, pot_params)
+                        subtitles, base_url, lang_code, lang_name, {})
                     if not caption_track.get('isTranslatable'):
                         continue
                 for trans_code, trans_name in translation_languages.items():
@@ -4027,25 +3950,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                         # Add an "-orig" label to the original language so that it can be distinguished.
                         # The subs are returned without "-orig" as well for compatibility
                         process_language(
-                            automatic_captions, base_url, f'{trans_code}-orig',
-                            f'{trans_name} (Original)', client_name, pot_params)
+                            automatic_captions, base_url, f'{trans_code}-orig', f'{trans_name} (Original)', {})
                     # Setting tlang=lang returns damaged subtitles.
-                    process_language(
-                        automatic_captions, base_url, trans_code, trans_name, client_name,
-                        pot_params if orig_lang == orig_trans_code else {'tlang': trans_code, **pot_params})
-
-            # Avoid duplication if we've already got everything we need
-            need_subs_langs.difference_update(subtitles)
-            need_caps_langs.difference_update(automatic_captions)
-            if not (need_subs_langs or need_caps_langs):
-                break
-
-        if skipped_subs_clients and (need_subs_langs or need_caps_langs):
-            self._report_pot_subtitles_skipped(video_id, True, msg=join_nonempty(
-                f'{video_id}: There are missing subtitles languages because a PO token was not provided.',
-                need_subs_langs and f'Subtitles for these languages are missing: {", ".join(need_subs_langs)}.',
-                need_caps_langs and f'Automatic captions for {len(need_caps_langs)} languages are missing.',
-                delim=' '))
+                    process_language(automatic_captions, base_url, trans_code, trans_name,
+                                     {} if orig_lang == orig_trans_code else {'tlang': trans_code})
 
         info['automatic_captions'] = automatic_captions
         info['subtitles'] = subtitles

yt_dlp/extractor/youtube/pot/README.md

@@ -4,10 +4,6 @@ As part of the YouTube extractor, we have a framework for providing PO Tokens pr
 
 Refer to the [PO Token Guide](https://github.com/yt-dlp/yt-dlp/wiki/PO-Token-Guide) for more information on PO Tokens.
 
-> [!TIP]
-> If publishing a PO Token Provider plugin to GitHub, add the [yt-dlp-pot-provider](https://github.com/topics/yt-dlp-pot-provider) topic to your repository to help users find it.
-
-
 ## Public APIs
 
 - `yt_dlp.extractor.youtube.pot.cache`
@@ -147,7 +143,7 @@ class MyPoTokenProviderPTP(PoTokenProvider):  # Provider class name must end wit
 
         return PoTokenResponse(
             po_token=po_token,
-            # Optional, add a custom expiration timestamp for the token. Use for caching.
+            # Optional, add a custom expiration time for the token. Use for caching.
             # By default, yt-dlp will use the default ttl from a registered cache spec (see below)
             # Set to 0 or -1 to not cache this response.
             expires_at=None,
@@ -172,7 +168,7 @@ def my_provider_preference(provider: PoTokenProvider, request: PoTokenRequest) -
 - Use `self.logger.debug` to log a message to the verbose output (`--verbose`).
   - For debugging information visible to users posting verbose logs.
   - Try to not log too much, prefer using trace logging for detailed debug messages.
-- Use `self.logger.trace` to log a message to the PO Token debug output (`--extractor-args "youtube:pot_trace=true"`). 
+- Use `self.logger.trace` to log a message to the PO Token debug output (`--extractor-args "youtube:pot_debug=true"`). 
   - Log as much as you like here as needed for debugging your provider.
 - Avoid logging PO Tokens or any sensitive information to debug or info output.
 

yt_dlp/extractor/youtube/pot/__init__.py

@@ -1,3 +1,2 @@
 # Trigger import of built-in providers
-from ._builtin.memory_cache import MemoryLRUPCP as _MemoryLRUPCP  # noqa: F401
-from ._builtin.webpo_cachespec import WebPoPCSP as _WebPoPCSP  # noqa: F401
+from ._builtin import _trigger_import  # noqa: F401

yt_dlp/extractor/youtube/pot/_builtin/__init__.py

@@ -0,0 +1,4 @@
+from .memory_cache import MemoryLRUPCP as _MemoryLRUPCP  # noqa: F401
+from .webpo_cachespec import WebPoPCSP as _WebPoPCSP  # noqa: F401
+
+_trigger_import = None  # noqa: F401

yt_dlp/extractor/youtube/pot/_builtin/memory_cache.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import datetime as dt
 import typing
+from collections import OrderedDict
 from threading import Lock
 
-from yt_dlp.extractor.youtube.pot._provider import BuiltinIEContentProvider
+from yt_dlp.extractor.youtube.pot._provider import BuiltInIEContentProvider
 from yt_dlp.extractor.youtube.pot._registry import _pot_memory_cache
 from yt_dlp.extractor.youtube.pot.cache import (
     PoTokenCacheProvider,
@@ -15,7 +16,7 @@ from yt_dlp.extractor.youtube.pot.cache import (
 
 def initialize_global_cache(max_size: int):
     if _pot_memory_cache.value.get('cache') is None:
-        _pot_memory_cache.value['cache'] = {}
+        _pot_memory_cache.value['cache'] = OrderedDict()
         _pot_memory_cache.value['lock'] = Lock()
         _pot_memory_cache.value['max_size'] = max_size
 
@@ -30,14 +31,14 @@ def initialize_global_cache(max_size: int):
 
 
 @register_provider
-class MemoryLRUPCP(PoTokenCacheProvider, BuiltinIEContentProvider):
+class MemoryLRUPCP(PoTokenCacheProvider, BuiltInIEContentProvider):
     PROVIDER_NAME = 'memory'
     DEFAULT_CACHE_SIZE = 25
 
     def __init__(
         self,
         *args,
-        initialize_cache: typing.Callable[[int], tuple[dict[str, tuple[str, int]], Lock, int]] = initialize_global_cache,
+        initialize_cache: typing.Callable[[int], tuple[OrderedDict, Lock, int]] = initialize_global_cache,
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
@@ -64,8 +65,7 @@ class MemoryLRUPCP(PoTokenCacheProvider, BuiltinIEContentProvider):
                 self.cache.pop(key)
             self.cache[key] = (value, expires_at)
             if len(self.cache) > self.max_size:
-                oldest_key = next(iter(self.cache))
-                self.cache.pop(oldest_key)
+                self.cache.popitem(last=False)
 
     def delete(self, key: str):
         with self.lock:

yt_dlp/extractor/youtube/pot/_builtin/webpo_cachespec.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from yt_dlp.extractor.youtube.pot._provider import BuiltinIEContentProvider
+from yt_dlp.extractor.youtube.pot._provider import BuiltInIEContentProvider
 from yt_dlp.extractor.youtube.pot.cache import (
     CacheProviderWritePolicy,
     PoTokenCacheSpec,
@@ -15,7 +15,7 @@ from yt_dlp.utils import traverse_obj
 
 
 @register_spec
-class WebPoPCSP(PoTokenCacheSpecProvider, BuiltinIEContentProvider):
+class WebPoPCSP(PoTokenCacheSpecProvider, BuiltInIEContentProvider):
     PROVIDER_NAME = 'webpo'
 
     def generate_cache_spec(self, request: PoTokenRequest) -> PoTokenCacheSpec | None:

yt_dlp/extractor/youtube/pot/_director.py

@@ -11,7 +11,7 @@ import urllib.parse
 from collections.abc import Iterable
 
 from yt_dlp.extractor.youtube.pot._provider import (
-    BuiltinIEContentProvider,
+    BuiltInIEContentProvider,
     IEContentProvider,
     IEContentProviderLogger,
 )
@@ -139,11 +139,12 @@ class PoTokenCache:
         }
         if spec._provider:
             bindings_cleaned['_p'] = spec._provider.PROVIDER_KEY
-        self.logger.trace(f'Generated cache key bindings: {bindings_cleaned}')
+        self.logger.trace(
+            'Generate cache key bindings: {}'.format(', '.join(f'{k}={v}' for k, v in bindings_cleaned.items())))
         return bindings_cleaned
 
     def _generate_key(self, bindings: dict) -> str:
-        binding_string = ''.join(repr(dict(sorted(bindings.items()))))
+        binding_string = ''.join(f'{k}{v}' for k, v in sorted(bindings.items()))
         return hashlib.sha256(binding_string.encode()).hexdigest()
 
     def get(self, request: PoTokenRequest) -> PoTokenResponse | None:
@@ -414,9 +415,9 @@ def provider_display_list(providers: Iterable[IEContentProvider]):
     def provider_display_name(provider):
         display_str = join_nonempty(
             provider.PROVIDER_NAME,
-            provider.PROVIDER_VERSION if not isinstance(provider, BuiltinIEContentProvider) else None)
+            provider.PROVIDER_VERSION if not isinstance(provider, BuiltInIEContentProvider) else None)
         statuses = []
-        if not isinstance(provider, BuiltinIEContentProvider):
+        if not isinstance(provider, BuiltInIEContentProvider):
             statuses.append('external')
         if not provider.is_available():
             statuses.append('unavailable')
@@ -450,10 +451,16 @@ def validate_response(response: PoTokenResponse | None):
     except ValueError:
         return False
 
-    if not isinstance(response.expires_at, int):
-        return response.expires_at is None
-
-    return response.expires_at <= 0 or response.expires_at > int(dt.datetime.now(dt.timezone.utc).timestamp())
+    return (
+        response.expires_at is None
+        or (
+            isinstance(response.expires_at, int)
+            and (
+                response.expires_at <= 0
+                or response.expires_at > int(dt.datetime.now(dt.timezone.utc).timestamp())
+            )
+        )
+    )
 
 
 def validate_cache_spec(spec: PoTokenCacheSpec):

yt_dlp/extractor/youtube/pot/_provider.py

@@ -120,7 +120,7 @@ class IEContentProvider(abc.ABC):
         return list(val) if casesense else [x.lower() for x in val]
 
 
-class BuiltinIEContentProvider(IEContentProvider, abc.ABC):
+class BuiltInIEContentProvider(IEContentProvider, abc.ABC):
     PROVIDER_VERSION = __version__
     BUG_REPORT_MESSAGE = bug_reports_message(before='')
 

yt_dlp/extractor/youtube/pot/provider.py

@@ -39,7 +39,6 @@ __all__ = [
 class PoTokenContext(enum.Enum):
     GVS = 'gvs'
     PLAYER = 'player'
-    SUBS = 'subs'
 
 
 @dataclasses.dataclass
@@ -245,7 +244,7 @@ def provider_bug_report_message(provider: IEContentProvider, before=';'):
     if not before or before.endswith(('.', '!', '?')):
         msg = msg[0].title() + msg[1:]
 
-    return f'{before} {msg}' if before else msg
+    return (before + ' ' if before else '') + msg
 
 
 def register_preference(*providers: type[PoTokenProvider]) -> typing.Callable[[Preference], Preference]:

yt_dlp/extractor/youtube/pot/utils.py

@@ -51,7 +51,7 @@ def get_webpo_content_binding(
                     return visitor_id, ContentBindingType.VISITOR_ID
             return request.visitor_data, ContentBindingType.VISITOR_DATA
 
-    elif request.context in (PoTokenContext.PLAYER, PoTokenContext.SUBS):
+    elif request.context == PoTokenContext.PLAYER or client_name != 'WEB_REMIX':
         return request.video_id, ContentBindingType.VIDEO_ID
 
     return None, None

yt_dlp/jsinterp.py

@@ -590,12 +590,39 @@ class JSInterpreter:
                     return ret, True
             return ret, False
 
+        for m in re.finditer(rf'''(?x)
+                (?P<pre_sign>\+\+|--)(?P<var1>{_NAME_RE})|
+                (?P<var2>{_NAME_RE})(?P<post_sign>\+\+|--)''', expr):
+            var = m.group('var1') or m.group('var2')
+            start, end = m.span()
+            sign = m.group('pre_sign') or m.group('post_sign')
+            ret = local_vars[var]
+            local_vars[var] += 1 if sign[0] == '+' else -1
+            if m.group('pre_sign'):
+                ret = local_vars[var]
+            expr = expr[:start] + self._dump(ret, local_vars) + expr[end:]
+
+        if not expr:
+            return None, should_return
+
         m = re.match(fr'''(?x)
+            (?P<assign>
                 (?P<out>{_NAME_RE})(?:\[(?P<index>{_NESTED_BRACKETS})\])?\s*
                 (?P<op>{"|".join(map(re.escape, set(_OPERATORS) - _COMP_OPERATORS))})?
                 =(?!=)(?P<expr>.*)$
-            ''', expr)
-        if m:  # We are assigning a value to a variable
+            )|(?P<return>
+                (?!if|return|true|false|null|undefined|NaN)(?P<name>{_NAME_RE})$
+            )|(?P<attribute>
+                (?P<var>{_NAME_RE})(?:
+                    (?P<nullish>\?)?\.(?P<member>[^(]+)|
+                    \[(?P<member2>{_NESTED_BRACKETS})\]
+                )\s*
+            )|(?P<indexing>
+                (?P<in>{_NAME_RE})\[(?P<idx>.+)\]$
+            )|(?P<function>
+                (?P<fname>{_NAME_RE})\((?P<args>.*)\)$
+            )''', expr)
+        if m and m.group('assign'):
             left_val = local_vars.get(m.group('out'))
 
             if not m.group('index'):
@@ -613,35 +640,7 @@ class JSInterpreter:
                 m.group('op'), self._index(left_val, idx), m.group('expr'), expr, local_vars, allow_recursion)
             return left_val[idx], should_return
 
-        for m in re.finditer(rf'''(?x)
-                (?P<pre_sign>\+\+|--)(?P<var1>{_NAME_RE})|
-                (?P<var2>{_NAME_RE})(?P<post_sign>\+\+|--)''', expr):
-            var = m.group('var1') or m.group('var2')
-            start, end = m.span()
-            sign = m.group('pre_sign') or m.group('post_sign')
-            ret = local_vars[var]
-            local_vars[var] += 1 if sign[0] == '+' else -1
-            if m.group('pre_sign'):
-                ret = local_vars[var]
-            expr = expr[:start] + self._dump(ret, local_vars) + expr[end:]
-
-        if not expr:
-            return None, should_return
-
-        m = re.match(fr'''(?x)
-            (?P<return>
-                (?!if|return|true|false|null|undefined|NaN)(?P<name>{_NAME_RE})$
-            )|(?P<attribute>
-                (?P<var>{_NAME_RE})(?:
-                    (?P<nullish>\?)?\.(?P<member>[^(]+)|
-                    \[(?P<member2>{_NESTED_BRACKETS})\]
-                )\s*
-            )|(?P<indexing>
-                (?P<in>{_NAME_RE})\[(?P<idx>.+)\]$
-            )|(?P<function>
-                (?P<fname>{_NAME_RE})\((?P<args>.*)\)$
-            )''', expr)
-        if expr.isdigit():
+        elif expr.isdigit():
             return int(expr), should_return
 
         elif expr == 'break':

yt_dlp/options.py

@@ -230,9 +230,6 @@ class _YoutubeDLOptionParser(optparse.OptionParser):
         formatter.indent()
         heading = formatter.format_heading('Preset Aliases')
         formatter.indent()
-        description = formatter.format_description(
-            'Predefined aliases for convenience and ease of use. Note that future versions of yt-dlp '
-            'may add or adjust presets, but the existing preset names will not be changed or removed')
         result = []
         for name, args in _PRESET_ALIASES.items():
             option = optparse.Option('-t', help=shlex.join(args))
@@ -241,7 +238,7 @@ class _YoutubeDLOptionParser(optparse.OptionParser):
         formatter.dedent()
         formatter.dedent()
         help_lines = '\n'.join(result)
-        return f'{formatted_help}\n{heading}{description}\n{help_lines}'
+        return f'{formatted_help}\n{heading}{help_lines}'
 
 
 def create_parser():
@@ -473,7 +470,7 @@ def create_parser():
     general.add_option(
         '--live-from-start',
         action='store_true', dest='live_from_start',
-        help='Download livestreams from the start. Currently experimental and only supported for YouTube and Twitch')
+        help='Download livestreams from the start. Currently only supported for YouTube (Experimental)')
     general.add_option(
         '--no-live-from-start',
         action='store_false', dest='live_from_start',
@@ -548,9 +545,9 @@ def create_parser():
         help=(
             'Create aliases for an option string. Unless an alias starts with a dash "-", it is prefixed with "--". '
             'Arguments are parsed according to the Python string formatting mini-language. '
-            'E.g. --alias get-audio,-X "-S aext:{0},abr -x --audio-format {0}" creates options '
+            'E.g. --alias get-audio,-X "-S=aext:{0},abr -x --audio-format {0}" creates options '
             '"--get-audio" and "-X" that takes an argument (ARG0) and expands to '
-            '"-S aext:ARG0,abr -x --audio-format ARG0". All defined aliases are listed in the --help output. '
+            '"-S=aext:ARG0,abr -x --audio-format ARG0". All defined aliases are listed in the --help output. '
             'Alias options can trigger more aliases; so be careful to avoid defining recursive options. '
             f'As a safety measure, each alias may be triggered a maximum of {_YoutubeDLOptionParser.ALIAS_TRIGGER_LIMIT} times. '
             'This option can be used multiple times'))

yt_dlp/version.py

@@ -1,8 +1,8 @@
 # Autogenerated by devscripts/update-version.py
 
-__version__ = '2025.05.22'
+__version__ = '2025.04.30'
 
-RELEASE_GIT_HEAD = '7977b329ed97b216e37bd402f4935f28c00eac9e'
+RELEASE_GIT_HEAD = '505b400795af557bdcfd9d4fa7e9133b26ef431c'
 
 VARIANT = None
 
@@ -12,4 +12,4 @@ CHANNEL = 'stable'
 
 ORIGIN = 'yt-dlp/yt-dlp'
 
-_pkg_version = '2025.05.22'
+_pkg_version = '2025.04.30'