diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0b90c0e6cc..baf3ffceea 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -742,3 +742,18 @@ lfavole
mp3butcher
slipinthedove
YoshiTabletopGamer
+Arc8ne
+benfaerber
+chrisellsworth
+fries1234
+Kenshin9977
+MichaelDeBoey
+msikma
+pedro
+pferreir
+red-acid
+refack
+rysson
+somini
+thedenv
+vallovic
diff --git a/Changelog.md b/Changelog.md
index 9c544feb92..b5ad6c6263 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,79 @@
# To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
-->
+### 2025.03.21
+
+#### Core changes
+- [Fix external downloader availability when using `--ffmpeg-location`](https://github.com/yt-dlp/yt-dlp/commit/9f77e04c76e36e1cbbf49bc9eb385fa6ef804b67) ([#12318](https://github.com/yt-dlp/yt-dlp/issues/12318)) by [Kenshin9977](https://github.com/Kenshin9977)
+- [Load plugins on demand](https://github.com/yt-dlp/yt-dlp/commit/4445f37a7a66b248dbd8376c43137e6e441f138e) ([#11305](https://github.com/yt-dlp/yt-dlp/issues/11305)) by [coletdjnz](https://github.com/coletdjnz), [Grub4K](https://github.com/Grub4K), [pukkandan](https://github.com/pukkandan) (With fixes in [c034d65](https://github.com/yt-dlp/yt-dlp/commit/c034d655487be668222ef9476a16f374584e49a7))
+- [Support emitting ConEmu progress codes](https://github.com/yt-dlp/yt-dlp/commit/f7a1f2d8132967a62b0f6d5665c6d2dde2d42c09) ([#10649](https://github.com/yt-dlp/yt-dlp/issues/10649)) by [Grub4K](https://github.com/Grub4K)
+
+#### Extractor changes
+- **azmedien**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/26a502fc727d0e91b2db6bf4a112823bcc672e85) ([#12375](https://github.com/yt-dlp/yt-dlp/issues/12375)) by [goggle](https://github.com/goggle)
+- **bilibiliplaylist**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f5fb2229e66cf59d5bf16065bc041b42a28354a0) ([#12690](https://github.com/yt-dlp/yt-dlp/issues/12690)) by [bashonly](https://github.com/bashonly)
+- **bunnycdn**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/3a1583ca75fb523cbad0e5e174387ea7b477d175) ([#11586](https://github.com/yt-dlp/yt-dlp/issues/11586)) by [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
+- **canalsurmas**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/01a8be4c23f186329d85f9c78db34a55f3294ac5) ([#12497](https://github.com/yt-dlp/yt-dlp/issues/12497)) by [Arc8ne](https://github.com/Arc8ne)
+- **cda**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/be0d819e1103195043f6743650781f0d4d343f6d) ([#12552](https://github.com/yt-dlp/yt-dlp/issues/12552)) by [rysson](https://github.com/rysson)
+- **cultureunplugged**: [Extend `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/3042afb5fe342d3a00de76704cd7de611acc350e) ([#12486](https://github.com/yt-dlp/yt-dlp/issues/12486)) by [seproDev](https://github.com/seproDev)
+- **dailymotion**: [Improve embed detection](https://github.com/yt-dlp/yt-dlp/commit/ad60137c141efa5023fbc0ac8579eaefe8b3d8cc) ([#12464](https://github.com/yt-dlp/yt-dlp/issues/12464)) by [seproDev](https://github.com/seproDev)
+- **gem.cbc.ca**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/eb1417786a3027b1e7290ec37ef6aaece50ebed0) ([#12414](https://github.com/yt-dlp/yt-dlp/issues/12414)) by [bashonly](https://github.com/bashonly)
+- **globo**: [Fix subtitles extraction](https://github.com/yt-dlp/yt-dlp/commit/0e1697232fcbba7551f983fd1ba93bb445cbb08b) ([#12270](https://github.com/yt-dlp/yt-dlp/issues/12270)) by [pedro](https://github.com/pedro)
+- **instagram**
+ - [Add `app_id` extractor-arg](https://github.com/yt-dlp/yt-dlp/commit/a90641c8363fa0c10800b36eb6b01ee22d3a9409) ([#12359](https://github.com/yt-dlp/yt-dlp/issues/12359)) by [chrisellsworth](https://github.com/chrisellsworth)
+ - [Fix extraction of older private posts](https://github.com/yt-dlp/yt-dlp/commit/a59abe0636dc49b22a67246afe35613571b86f05) ([#12451](https://github.com/yt-dlp/yt-dlp/issues/12451)) by [bashonly](https://github.com/bashonly)
+ - [Improve error handling](https://github.com/yt-dlp/yt-dlp/commit/480125560a3b9972d29ae0da850aba8109e6bd41) ([#12410](https://github.com/yt-dlp/yt-dlp/issues/12410)) by [bashonly](https://github.com/bashonly)
+ - story: [Support `--no-playlist`](https://github.com/yt-dlp/yt-dlp/commit/65c3c58c0a67463a150920203cec929045c95a24) ([#12397](https://github.com/yt-dlp/yt-dlp/issues/12397)) by [fireattack](https://github.com/fireattack)
+- **jamendo**: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/89a68c4857ddbaf937ff22f12648baaf6b5af840) ([#12622](https://github.com/yt-dlp/yt-dlp/issues/12622)) by [bashonly](https://github.com/bashonly), [JChris246](https://github.com/JChris246)
+- **ketnet**: [Remove extractor](https://github.com/yt-dlp/yt-dlp/commit/bbada3ec0779422cde34f1ce3dcf595da463b493) ([#12628](https://github.com/yt-dlp/yt-dlp/issues/12628)) by [MichaelDeBoey](https://github.com/MichaelDeBoey)
+- **lbry**
+ - [Make m3u8 format extraction non-fatal](https://github.com/yt-dlp/yt-dlp/commit/9807181cfbf87bfa732f415c30412bdbd77cbf81) ([#12463](https://github.com/yt-dlp/yt-dlp/issues/12463)) by [bashonly](https://github.com/bashonly)
+ - [Raise appropriate error for non-media files](https://github.com/yt-dlp/yt-dlp/commit/7126b472601814b7fd8c9de02069e8fff1764891) ([#12462](https://github.com/yt-dlp/yt-dlp/issues/12462)) by [bashonly](https://github.com/bashonly)
+- **loco**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/983095485c731240aae27c950cb8c24a50827b56) ([#12667](https://github.com/yt-dlp/yt-dlp/issues/12667)) by [DTrombett](https://github.com/DTrombett)
+- **magellantv**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/172d5fcd778bf2605db7647ebc56b29ed18d24ac) ([#12505](https://github.com/yt-dlp/yt-dlp/issues/12505)) by [seproDev](https://github.com/seproDev)
+- **mitele**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/7223d29569a48a35ad132a508c115973866838d3) ([#12689](https://github.com/yt-dlp/yt-dlp/issues/12689)) by [bashonly](https://github.com/bashonly)
+- **msn**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/4815dac131d42c51e12c1d05232db0bbbf607329) ([#12513](https://github.com/yt-dlp/yt-dlp/issues/12513)) by [seproDev](https://github.com/seproDev), [thedenv](https://github.com/thedenv)
+- **n1**: [Fix extraction of newer articles](https://github.com/yt-dlp/yt-dlp/commit/9d70abe4de401175cbbaaa36017806f16b2df9af) ([#12514](https://github.com/yt-dlp/yt-dlp/issues/12514)) by [u-spec-png](https://github.com/u-spec-png)
+- **nbcstations**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/ebac65aa9e0bf9a97c24d00f7977900d2577364b) ([#12534](https://github.com/yt-dlp/yt-dlp/issues/12534)) by [refack](https://github.com/refack)
+- **niconico**
+ - [Fix format sorting](https://github.com/yt-dlp/yt-dlp/commit/7508e34f203e97389f1d04db92140b13401dd724) ([#12442](https://github.com/yt-dlp/yt-dlp/issues/12442)) by [xpadev-net](https://github.com/xpadev-net)
+ - live: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/c2e6e1d5f77f3b720a6266f2869eb750d20e5dc1) ([#12419](https://github.com/yt-dlp/yt-dlp/issues/12419)) by [bashonly](https://github.com/bashonly)
+- **openrec**: [Fix `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/17504f253564cfad86244de2b6346d07d2300ca5) ([#12608](https://github.com/yt-dlp/yt-dlp/issues/12608)) by [fireattack](https://github.com/fireattack)
+- **pinterest**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/bd0a66816934de70312eea1e71c59c13b401dc3a) ([#12538](https://github.com/yt-dlp/yt-dlp/issues/12538)) by [mikf](https://github.com/mikf)
+- **playsuisse**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/6933f5670cea9c3e2fb16c1caa1eda54d13122c5) ([#12444](https://github.com/yt-dlp/yt-dlp/issues/12444)) by [bashonly](https://github.com/bashonly)
+- **reddit**: [Truncate title](https://github.com/yt-dlp/yt-dlp/commit/d9a53cc1e6fd912daf500ca4f19e9ca88994dbf9) ([#12567](https://github.com/yt-dlp/yt-dlp/issues/12567)) by [seproDev](https://github.com/seproDev)
+- **rtp**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/8eb9c1bf3b9908cca22ef043602aa24fb9f352c6) ([#11638](https://github.com/yt-dlp/yt-dlp/issues/11638)) by [pferreir](https://github.com/pferreir), [red-acid](https://github.com/red-acid), [seproDev](https://github.com/seproDev), [somini](https://github.com/somini), [vallovic](https://github.com/vallovic)
+- **softwhiteunderbelly**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/652827d5a076c9483c36654ad2cf3fe46219baf4) ([#12281](https://github.com/yt-dlp/yt-dlp/issues/12281)) by [benfaerber](https://github.com/benfaerber)
+- **soop**: [Fix timestamp extraction](https://github.com/yt-dlp/yt-dlp/commit/8305df00012ff8138a6ff95279d06b54ac607f63) ([#12609](https://github.com/yt-dlp/yt-dlp/issues/12609)) by [msikma](https://github.com/msikma)
+- **soundcloud**
+ - [Extract tags](https://github.com/yt-dlp/yt-dlp/commit/9deed13d7cce6d3647379e50589c92de89227509) ([#12420](https://github.com/yt-dlp/yt-dlp/issues/12420)) by [bashonly](https://github.com/bashonly)
+ - [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/6deeda5c11f34f613724fa0627879f0d607ba1b4) ([#12447](https://github.com/yt-dlp/yt-dlp/issues/12447)) by [bashonly](https://github.com/bashonly)
+- **tiktok**
+ - [Improve error handling](https://github.com/yt-dlp/yt-dlp/commit/99ea2978757a431eeb2a265b3395ccbe4ce202cf) ([#12445](https://github.com/yt-dlp/yt-dlp/issues/12445)) by [bashonly](https://github.com/bashonly)
+ - [Truncate title](https://github.com/yt-dlp/yt-dlp/commit/83b119dadb0f267f1fb66bf7ed74c097349de79e) ([#12566](https://github.com/yt-dlp/yt-dlp/issues/12566)) by [seproDev](https://github.com/seproDev)
+- **tv8.it**: [Add live and playlist extractors](https://github.com/yt-dlp/yt-dlp/commit/2ee3a0aff9be2be3bea60640d3d8a0febaf0acb6) ([#12569](https://github.com/yt-dlp/yt-dlp/issues/12569)) by [DTrombett](https://github.com/DTrombett)
+- **tvw**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/42b7440963866e31ff84a5b89030d1c596fa2e6e) ([#12271](https://github.com/yt-dlp/yt-dlp/issues/12271)) by [fries1234](https://github.com/fries1234)
+- **twitter**
+ - [Fix syndication token generation](https://github.com/yt-dlp/yt-dlp/commit/b8b47547049f5ebc3dd680fc7de70ed0ca9c0d70) ([#12537](https://github.com/yt-dlp/yt-dlp/issues/12537)) by [bashonly](https://github.com/bashonly)
+ - [Truncate title](https://github.com/yt-dlp/yt-dlp/commit/06f6de78db2eceeabd062ab1a3023e0ff9d4df53) ([#12560](https://github.com/yt-dlp/yt-dlp/issues/12560)) by [seproDev](https://github.com/seproDev)
+- **vk**: [Improve metadata extraction](https://github.com/yt-dlp/yt-dlp/commit/05c8023a27dd37c49163c0498bf98e3e3c1cb4b9) ([#12510](https://github.com/yt-dlp/yt-dlp/issues/12510)) by [seproDev](https://github.com/seproDev)
+- **vrtmax**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/df9ebeec00d658693252978d1ffb885e67aa6ab6) ([#12479](https://github.com/yt-dlp/yt-dlp/issues/12479)) by [bergoid](https://github.com/bergoid), [MichaelDeBoey](https://github.com/MichaelDeBoey), [seproDev](https://github.com/seproDev)
+- **weibo**: [Support playlists](https://github.com/yt-dlp/yt-dlp/commit/0bb39788626002a8a67e925580227952c563c8b9) ([#12284](https://github.com/yt-dlp/yt-dlp/issues/12284)) by [4ft35t](https://github.com/4ft35t)
+- **wsj**: [Support opinion URLs and impersonation](https://github.com/yt-dlp/yt-dlp/commit/7f3006eb0c0659982bb956d71b0bc806bcb0a5f2) ([#12431](https://github.com/yt-dlp/yt-dlp/issues/12431)) by [refack](https://github.com/refack)
+- **youtube**
+ - [Fix nsig and signature extraction for player `643afba4`](https://github.com/yt-dlp/yt-dlp/commit/9b868518a15599f3d7ef5a1c730dda164c30da9b) ([#12684](https://github.com/yt-dlp/yt-dlp/issues/12684)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
+ - [Player client maintenance](https://github.com/yt-dlp/yt-dlp/commit/3380febe9984c21c79c3147c1d390a4cf339bc4c) ([#12603](https://github.com/yt-dlp/yt-dlp/issues/12603)) by [seproDev](https://github.com/seproDev)
+ - [Split into package](https://github.com/yt-dlp/yt-dlp/commit/4432a9390c79253ac830702b226d2e558b636725) ([#12557](https://github.com/yt-dlp/yt-dlp/issues/12557)) by [coletdjnz](https://github.com/coletdjnz)
+ - [Warn on DRM formats](https://github.com/yt-dlp/yt-dlp/commit/e67d786c7cc87bd449d22e0ddef08306891c1173) ([#12593](https://github.com/yt-dlp/yt-dlp/issues/12593)) by [coletdjnz](https://github.com/coletdjnz)
+ - [Warn on missing formats due to SSAP](https://github.com/yt-dlp/yt-dlp/commit/79ec2fdff75c8c1bb89b550266849ad4dec48dd3) ([#12483](https://github.com/yt-dlp/yt-dlp/issues/12483)) by [coletdjnz](https://github.com/coletdjnz)
+
+#### Networking changes
+- [Add `keep_header_casing` extension](https://github.com/yt-dlp/yt-dlp/commit/7d18fed8f1983fe6de4ddc810dfb2761ba5744ac) ([#11652](https://github.com/yt-dlp/yt-dlp/issues/11652)) by [coletdjnz](https://github.com/coletdjnz), [Grub4K](https://github.com/Grub4K)
+- [Always add unsupported suffix on version mismatch](https://github.com/yt-dlp/yt-dlp/commit/95f8df2f796d0048119615200758199aedcd7cf4) ([#12626](https://github.com/yt-dlp/yt-dlp/issues/12626)) by [Grub4K](https://github.com/Grub4K)
+
+#### Misc. changes
+- **cleanup**: Miscellaneous: [f36e4b6](https://github.com/yt-dlp/yt-dlp/commit/f36e4b6e65cb8403791aae2f520697115cb88dec) by [dirkf](https://github.com/dirkf), [gamer191](https://github.com/gamer191), [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
+- **test**: [Show all differences for `expect_value` and `expect_dict`](https://github.com/yt-dlp/yt-dlp/commit/a3e0c7d3b267abdf3933b709704a28d43bb46503) ([#12334](https://github.com/yt-dlp/yt-dlp/issues/12334)) by [Grub4K](https://github.com/Grub4K)
+
### 2025.02.19
#### Core changes
diff --git a/pyproject.toml b/pyproject.toml
index 2a0008a45a..5e987a6fd3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,8 +55,7 @@ default = [
"websockets>=13.0",
]
curl-cffi = [
- "curl-cffi==0.5.10; os_name=='nt' and implementation_name=='cpython'",
- "curl-cffi>=0.5.10,!=0.6.*,<0.7.2; os_name!='nt' and implementation_name=='cpython'",
+ "curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.11; implementation_name=='cpython'",
]
secretstorage = [
"cffi",
@@ -76,7 +75,7 @@ dev = [
]
static-analysis = [
"autopep8~=2.0",
- "ruff~=0.9.0",
+ "ruff~=0.11.0",
]
test = [
"pytest~=8.1",
@@ -387,7 +386,11 @@ select = [
exclude = "*/extractor/lazy_extractors.py,*venv*,*/test/testdata/sigs/player-*.js,.idea,.vscode"
[tool.pytest.ini_options]
-addopts = "-ra -v --strict-markers"
+addopts = [
+ "-ra", # summary: all except passed
+ "--verbose",
+ "--strict-markers",
+]
markers = [
"download",
]
diff --git a/supportedsites.md b/supportedsites.md
index 0924c88ffb..d85325d491 100644
--- a/supportedsites.md
+++ b/supportedsites.md
@@ -224,6 +224,7 @@ The only reliable way to check if a site is supported is to try it.
- **bt:vestlendingen**: Bergens Tidende - Vestlendingen
- **Bundesliga**
- **Bundestag**
+ - **BunnyCdn**
- **BusinessInsider**
- **BuzzFeed**
- **BYUtv**: (**Currently broken**)
@@ -242,6 +243,7 @@ The only reliable way to check if a site is supported is to try it.
- **CanalAlpha**
- **canalc2.tv**
- **Canalplus**: mycanal.fr and piwiplus.fr
+ - **Canalsurmas**
- **CaracolTvPlay**: [*caracoltv-play*](## "netrc machine")
- **CartoonNetwork**
- **cbc.ca**
@@ -609,10 +611,10 @@ The only reliable way to check if a site is supported is to try it.
- **Inc**
- **IndavideoEmbed**
- **InfoQ**
- - **Instagram**: [*instagram*](## "netrc machine")
- - **instagram:story**: [*instagram*](## "netrc machine")
- - **instagram:tag**: [*instagram*](## "netrc machine") Instagram hashtag search URLs
- - **instagram:user**: [*instagram*](## "netrc machine") Instagram user profile (**Currently broken**)
+ - **Instagram**
+ - **instagram:story**
+ - **instagram:tag**: Instagram hashtag search URLs
+ - **instagram:user**: Instagram user profile (**Currently broken**)
- **InstagramIOS**: IOS instagram:// URL
- **Internazionale**
- **InternetVideoArchive**
@@ -661,7 +663,6 @@ The only reliable way to check if a site is supported is to try it.
- **KelbyOne**: (**Currently broken**)
- **Kenh14Playlist**
- **Kenh14Video**
- - **Ketnet**
- **khanacademy**
- **khanacademy:unit**
- **kick:clips**
@@ -733,6 +734,7 @@ The only reliable way to check if a site is supported is to try it.
- **Livestreamfails**
- **Lnk**
- **loc**: Library of Congress
+ - **Loco**
- **loom**
- **loom:folder**
- **LoveHomePorn**
@@ -831,7 +833,7 @@ The only reliable way to check if a site is supported is to try it.
- **MoviewPlay**
- **Moviezine**
- **MovingImage**
- - **MSN**: (**Currently broken**)
+ - **MSN**
- **mtg**: MTG services
- **mtv**
- **mtv.de**: (**Currently broken**)
@@ -1342,6 +1344,7 @@ The only reliable way to check if a site is supported is to try it.
- **Smotrim**
- **SnapchatSpotlight**
- **Snotr**
+ - **SoftWhiteUnderbelly**: [*softwhiteunderbelly*](## "netrc machine")
- **Sohu**
- **SohuV**
- **SonyLIV**: [*sonyliv*](## "netrc machine")
@@ -1536,6 +1539,8 @@ The only reliable way to check if a site is supported is to try it.
- **tv5unis**
- **tv5unis:video**
- **tv8.it**
+ - **tv8.it:live**: TV8 Live
+ - **tv8.it:playlist**: TV8 Playlist
- **TVANouvelles**
- **TVANouvellesArticle**
- **tvaplus**: TVA+
@@ -1556,6 +1561,7 @@ The only reliable way to check if a site is supported is to try it.
- **tvp:vod:series**
- **TVPlayer**
- **TVPlayHome**
+ - **Tvw**
- **Tweakers**
- **TwitCasting**
- **TwitCastingLive**
@@ -1677,7 +1683,7 @@ The only reliable way to check if a site is supported is to try it.
- **vqq:series**
- **vqq:video**
- **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
- - **VrtNU**: [*vrtnu*](## "netrc machine") VRT MAX
+ - **vrtmax**: [*vrtnu*](## "netrc machine") VRT MAX (formerly VRT NU)
- **VTM**: (**Currently broken**)
- **VTV**
- **VTVGo**
diff --git a/test/test_http_proxy.py b/test/test_http_proxy.py
index 2435c878a5..e903ff8beb 100644
--- a/test/test_http_proxy.py
+++ b/test/test_http_proxy.py
@@ -331,10 +331,6 @@ class TestHTTPConnectProxy:
assert proxy_info['proxy'] == server_address
assert 'Proxy-Authorization' in proxy_info['headers']
- @pytest.mark.skip_handler(
- 'Requests',
- 'bug in urllib3 causes unclosed socket: https://github.com/urllib3/urllib3/issues/3374',
- )
def test_http_connect_bad_auth(self, handler, ctx):
with ctx.http_server(HTTPConnectProxyHandler, username='test', password='test') as server_address:
with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'http://test:bad@{server_address}'}) as rh:
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index ed3ca61c4b..d3076298cc 100644
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -384,7 +384,7 @@ class TestJSInterpreter(unittest.TestCase):
@unittest.skip('Not implemented')
def test_packed(self):
jsi = JSInterpreter('''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''')
- self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))
+ self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|'))) # noqa: SIM905
def test_join(self):
test_input = list('test')
@@ -462,6 +462,16 @@ class TestJSInterpreter(unittest.TestCase):
]:
assert js_number_to_string(test, radix) == expected
+ def test_extract_function(self):
+ jsi = JSInterpreter('function a(b) { return b + 1; }')
+ func = jsi.extract_function('a')
+ self.assertEqual(func([2]), 3)
+
+ def test_extract_function_with_global_stack(self):
+ jsi = JSInterpreter('function c(d) { return d + e + f + g; }')
+ func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
+ self.assertEqual(func([1]), 1111)
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_networking.py b/test/test_networking.py
index 63914bc4ba..3ab60fe836 100644
--- a/test/test_networking.py
+++ b/test/test_networking.py
@@ -614,7 +614,6 @@ class TestHTTPRequestHandler(TestRequestHandlerBase):
rh, Request(f'http://127.0.0.1:{self.http_port}/source_address')).read().decode()
assert source_address == data
- # Not supported by CurlCFFI
@pytest.mark.skip_handler('CurlCFFI', 'not supported by curl-cffi')
def test_gzip_trailing_garbage(self, handler):
with handler() as rh:
diff --git a/test/test_subtitles.py b/test/test_subtitles.py
index f3b0056179..efd69b33d9 100644
--- a/test/test_subtitles.py
+++ b/test/test_subtitles.py
@@ -23,7 +23,6 @@ from yt_dlp.extractor import (
TedTalkIE,
ThePlatformFeedIE,
ThePlatformIE,
- VikiIE,
VimeoIE,
WallaIE,
YoutubeIE,
@@ -331,20 +330,6 @@ class TestRaiPlaySubtitles(BaseTestSubtitles):
self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
-@is_download_test
-@unittest.skip('IE broken - DRM only')
-class TestVikiSubtitles(BaseTestSubtitles):
- url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
- IE = VikiIE
-
- def test_allsubtitles(self):
- self.DL.params['writesubtitles'] = True
- self.DL.params['allsubtitles'] = True
- subtitles = self.getSubtitles()
- self.assertEqual(set(subtitles.keys()), {'en'})
- self.assertEqual(md5(subtitles['en']), '53cb083a5914b2d84ef1ab67b880d18a')
-
-
@is_download_test
class TestThePlatformSubtitles(BaseTestSubtitles):
# from http://www.3playmedia.com/services-features/tools/integrations/theplatform/
diff --git a/test/test_utils.py b/test/test_utils.py
index 65f28db363..42dc7f937e 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -219,11 +219,8 @@ class TestUtil(unittest.TestCase):
self.assertEqual(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw')
self.assertEqual(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI')
+ @unittest.mock.patch('sys.platform', 'win32')
def test_sanitize_path(self):
- with unittest.mock.patch('sys.platform', 'win32'):
- self._test_sanitize_path()
-
- def _test_sanitize_path(self):
self.assertEqual(sanitize_path('abc'), 'abc')
self.assertEqual(sanitize_path('abc/def'), 'abc\\def')
self.assertEqual(sanitize_path('abc\\def'), 'abc\\def')
@@ -254,10 +251,8 @@ class TestUtil(unittest.TestCase):
# Check with nt._path_normpath if available
try:
- import nt
-
- nt_path_normpath = getattr(nt, '_path_normpath', None)
- except Exception:
+ from nt import _path_normpath as nt_path_normpath
+ except ImportError:
nt_path_normpath = None
for test, expected in [
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 7ae627f2c0..45dc9113bd 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -78,6 +78,11 @@ _SIG_TESTS = [
'2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
'0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xxAj7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJ2OySqa0q',
),
+ (
+ 'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'AAOAOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7vgpDL0QwbdV06sCIEzpWqMGkFR20CFOS21Tp-7vj_EMu-m37KtXJoOy1',
+ ),
]
_NSIG_TESTS = [
@@ -205,6 +210,30 @@ _NSIG_TESTS = [
'https://www.youtube.com/s/player/9c6dfc4a/player_ias.vflset/en_US/base.js',
'jbu7ylIosQHyJyJV', 'uwI0ESiynAmhNg',
),
+ (
+ 'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
+ 'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
+ ),
+ (
+ 'https://www.youtube.com/s/player/d50f54ef/player_ias_tce.vflset/en_US/base.js',
+ 'Ha7507LzRmH3Utygtj', 'XFTb2HoeOE5MHg',
+ ),
+ (
+ 'https://www.youtube.com/s/player/074a8365/player_ias_tce.vflset/en_US/base.js',
+ 'Ha7507LzRmH3Utygtj', 'ufTsrE0IVYrkl8v',
+ ),
+ (
+ 'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
+ 'N5uAlLqm0eg1GyHO', 'dCBQOejdq5s-ww',
+ ),
+ (
+ 'https://www.youtube.com/s/player/69f581a5/tv-player-ias.vflset/tv-player-ias.js',
+ '-qIP447rVlTTwaZjY', 'KNcGOksBAvwqQg',
+ ),
+ (
+ 'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
+ 'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
+ ),
]
@@ -218,6 +247,8 @@ class TestPlayerInfo(unittest.TestCase):
('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
+ ('https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js', 'e7567ecf'),
+ ('https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js', '643afba4'),
# obsolete
('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
@@ -250,7 +281,7 @@ def t_factory(name, sig_func, url_pattern):
def make_tfunc(url, sig_input, expected_sig):
m = url_pattern.match(url)
assert m, f'{url!r} should follow URL format'
- test_id = m.group('id')
+ test_id = re.sub(r'[/.-]', '_', m.group('id') or m.group('compat_id'))
def test_func(self):
basename = f'player-{name}-{test_id}.js'
@@ -279,17 +310,22 @@ def n_sig(jscode, sig_input):
ie = YoutubeIE(FakeYDL())
funcname = ie._extract_n_function_name(jscode)
jsi = JSInterpreter(jscode)
- func = jsi.extract_function_from_code(*ie._fixup_n_function_code(*jsi.extract_function_code(funcname)))
+ func = jsi.extract_function_from_code(*ie._fixup_n_function_code(*jsi.extract_function_code(funcname), jscode))
return func([sig_input])
make_sig_test = t_factory(
- 'signature', signature, re.compile(r'.*(?:-|/player/)(?P[a-zA-Z0-9_-]+)(?:/.+\.js|(?:/watch_as3|/html5player)?\.[a-z]+)$'))
+ 'signature', signature,
+ re.compile(r'''(?x)
+ .+(?:
+ /player/(?P[a-zA-Z0-9_/.-]+)|
+ /html5player-(?:en_US-)?(?P[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?
+ )\.js$'''))
for test_spec in _SIG_TESTS:
make_sig_test(*test_spec)
make_nsig_test = t_factory(
- 'nsig', n_sig, re.compile(r'.+/player/(?P[a-zA-Z0-9_-]+)/.+.js$'))
+ 'nsig', n_sig, re.compile(r'.+/player/(?P[a-zA-Z0-9_/.-]+)\.js$'))
for test_spec in _NSIG_TESTS:
make_nsig_test(*test_spec)
diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py
index 8790b326b7..63e6e11b26 100644
--- a/yt_dlp/YoutubeDL.py
+++ b/yt_dlp/YoutubeDL.py
@@ -654,19 +654,21 @@ class YoutubeDL:
if not all_plugins_loaded.value:
load_all_plugins()
- try:
- windows_enable_vt_mode()
- except Exception as e:
- self.write_debug(f'Failed to enable VT mode: {e}')
-
stdout = sys.stderr if self.params.get('logtostderr') else sys.stdout
self._out_files = Namespace(
out=stdout,
error=sys.stderr,
screen=sys.stderr if self.params.get('quiet') else stdout,
- console=next(filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None),
)
+ try:
+ windows_enable_vt_mode()
+ except Exception as e:
+ self.write_debug(f'Failed to enable VT mode: {e}')
+
+ # hehe "immutable" namespace
+ self._out_files.console = next(filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None)
+
if self.params.get('no_color'):
if self.params.get('color') is not None:
self.params.setdefault('_warnings', []).append(
@@ -4150,7 +4152,7 @@ class YoutubeDL:
(target, rh.RH_NAME)
for rh in self._request_director.handlers.values()
if isinstance(rh, ImpersonateRequestHandler)
- for target in rh.supported_targets
+ for target in reversed(rh.supported_targets)
]
def _impersonate_target_available(self, target):
diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py
index 7d8f100474..714d9ad5c2 100644
--- a/yt_dlp/__init__.py
+++ b/yt_dlp/__init__.py
@@ -1021,8 +1021,9 @@ def _real_main(argv=None):
# List of simplified targets we know are supported,
# to help users know what dependencies may be required.
(ImpersonateTarget('chrome'), 'curl_cffi'),
- (ImpersonateTarget('edge'), 'curl_cffi'),
(ImpersonateTarget('safari'), 'curl_cffi'),
+ (ImpersonateTarget('firefox'), 'curl_cffi>=0.10'),
+ (ImpersonateTarget('edge'), 'curl_cffi'),
]
available_targets = ydl._get_available_impersonate_targets()
@@ -1038,12 +1039,12 @@ def _real_main(argv=None):
for known_target, known_handler in known_targets:
if not any(
- known_target in target and handler == known_handler
+ known_target in target and known_handler.startswith(handler)
for target, handler in available_targets
):
- rows.append([
+ rows.insert(0, [
ydl._format_out(text, ydl.Styles.SUPPRESS)
- for text in make_row(known_target, f'{known_handler} (not available)')
+ for text in make_row(known_target, f'{known_handler} (unavailable)')
])
ydl.to_screen('[info] Available impersonate targets')
diff --git a/yt_dlp/aes.py b/yt_dlp/aes.py
index 9908434a58..065901d68d 100644
--- a/yt_dlp/aes.py
+++ b/yt_dlp/aes.py
@@ -83,7 +83,7 @@ def aes_ecb_encrypt(data, key, iv=None):
@returns {int[]} encrypted data
"""
expanded_key = key_expansion(key)
- block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+ block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
encrypted_data = []
for i in range(block_count):
@@ -103,7 +103,7 @@ def aes_ecb_decrypt(data, key, iv=None):
@returns {int[]} decrypted data
"""
expanded_key = key_expansion(key)
- block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+ block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
encrypted_data = []
for i in range(block_count):
@@ -134,7 +134,7 @@ def aes_ctr_encrypt(data, key, iv):
@returns {int[]} encrypted data
"""
expanded_key = key_expansion(key)
- block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+ block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
counter = iter_vector(iv)
encrypted_data = []
@@ -158,7 +158,7 @@ def aes_cbc_decrypt(data, key, iv):
@returns {int[]} decrypted data
"""
expanded_key = key_expansion(key)
- block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+ block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
decrypted_data = []
previous_cipher_block = iv
@@ -183,7 +183,7 @@ def aes_cbc_encrypt(data, key, iv, *, padding_mode='pkcs7'):
@returns {int[]} encrypted data
"""
expanded_key = key_expansion(key)
- block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+ block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
encrypted_data = []
previous_cipher_block = iv
diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py
index 74a043b9c8..c56ec9df6a 100644
--- a/yt_dlp/extractor/_extractors.py
+++ b/yt_dlp/extractor/_extractors.py
@@ -496,10 +496,6 @@ from .daum import (
from .daystar import DaystarClipIE
from .dbtv import DBTVIE
from .dctp import DctpTvIE
-from .deezer import (
- DeezerAlbumIE,
- DeezerPlaylistIE,
-)
from .democracynow import DemocracynowIE
from .detik import DetikEmbedIE
from .deuxm import (
@@ -1055,6 +1051,7 @@ from .livestream import (
)
from .livestreamfails import LivestreamfailsIE
from .lnk import LnkIE
+from .loco import LocoIE
from .loom import (
LoomFolderIE,
LoomIE,
@@ -2351,10 +2348,6 @@ from .viewlift import (
ViewLiftIE,
)
from .viidea import ViideaIE
-from .viki import (
- VikiChannelIE,
- VikiIE,
-)
from .vimeo import (
VHXEmbedIE,
VimeoAlbumIE,
@@ -2402,7 +2395,6 @@ from .voxmedia import (
from .vrt import (
VRTIE,
DagelijkseKostIE,
- KetnetIE,
Radio1BeIE,
VrtNUIE,
)
diff --git a/yt_dlp/extractor/afreecatv.py b/yt_dlp/extractor/afreecatv.py
index 572d1a3893..aadb4d6605 100644
--- a/yt_dlp/extractor/afreecatv.py
+++ b/yt_dlp/extractor/afreecatv.py
@@ -1,3 +1,4 @@
+import datetime as dt
import functools
from .common import InfoExtractor
@@ -10,7 +11,7 @@ from ..utils import (
filter_dict,
int_or_none,
orderedSet,
- unified_timestamp,
+ parse_iso8601,
url_or_none,
urlencode_postdata,
urljoin,
@@ -87,9 +88,9 @@ class AfreecaTVIE(AfreecaTVBaseIE):
'uploader_id': 'rlantnghks',
'uploader': '페이즈으',
'duration': 10840,
- 'thumbnail': r're:https?://videoimg\.sooplive\.co/.kr/.+',
+ 'thumbnail': r're:https?://videoimg\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
'upload_date': '20230108',
- 'timestamp': 1673218805,
+ 'timestamp': 1673186405,
'title': '젠지 페이즈',
},
'params': {
@@ -102,7 +103,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
'id': '20170411_BE689A0E_190960999_1_2_h',
'ext': 'mp4',
'title': '혼자사는여자집',
- 'thumbnail': r're:https?://(?:video|st)img\.sooplive\.co\.kr/.+',
+ 'thumbnail': r're:https?://(?:video|st)img\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
'uploader': '♥이슬이',
'uploader_id': 'dasl8121',
'upload_date': '20170411',
@@ -119,7 +120,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
'id': '20180327_27901457_202289533_1',
'ext': 'mp4',
'title': '[생]빨개요♥ (part 1)',
- 'thumbnail': r're:https?://(?:video|st)img\.sooplive\.co\.kr/.+',
+ 'thumbnail': r're:https?://(?:video|st)img\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
'uploader': '[SA]서아',
'uploader_id': 'bjdyrksu',
'upload_date': '20180327',
@@ -187,7 +188,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
'formats': formats,
**traverse_obj(file_element, {
'duration': ('duration', {int_or_none(scale=1000)}),
- 'timestamp': ('file_start', {unified_timestamp}),
+ 'timestamp': ('file_start', {parse_iso8601(delimiter=' ', timezone=dt.timedelta(hours=9))}),
}),
})
@@ -370,7 +371,7 @@ class AfreecaTVLiveIE(AfreecaTVBaseIE):
'title': channel_info.get('TITLE') or station_info.get('station_title'),
'uploader': channel_info.get('BJNICK') or station_info.get('station_name'),
'uploader_id': broadcaster_id,
- 'timestamp': unified_timestamp(station_info.get('broad_start')),
+ 'timestamp': parse_iso8601(station_info.get('broad_start'), delimiter=' ', timezone=dt.timedelta(hours=9)),
'formats': formats,
'is_live': True,
'http_headers': {'Referer': url},
diff --git a/yt_dlp/extractor/bandlab.py b/yt_dlp/extractor/bandlab.py
index 64aa2ba70d..f110b793b5 100644
--- a/yt_dlp/extractor/bandlab.py
+++ b/yt_dlp/extractor/bandlab.py
@@ -86,7 +86,7 @@ class BandlabBaseIE(InfoExtractor):
'webpage_url': (
'id', ({value(url)}, {format_field(template='https://www.bandlab.com/post/%s')}), filter, any),
'url': ('video', 'url', {url_or_none}),
- 'title': ('caption', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=50)}),
+ 'title': ('caption', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}),
'description': ('caption', {str}),
'thumbnail': ('video', 'picture', 'url', {url_or_none}),
'view_count': ('video', 'counters', 'plays', {int_or_none}),
@@ -120,7 +120,7 @@ class BandlabIE(BandlabBaseIE):
'duration': 54.629999999999995,
'title': 'sweet black',
'upload_date': '20231210',
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
'genres': ['Lofi'],
'uploader': 'ender milze',
'comment_count': int,
@@ -142,7 +142,7 @@ class BandlabIE(BandlabBaseIE):
'duration': 54.629999999999995,
'title': 'sweet black',
'upload_date': '20231210',
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
'genres': ['Lofi'],
'uploader': 'ender milze',
'comment_count': int,
@@ -158,7 +158,7 @@ class BandlabIE(BandlabBaseIE):
'comment_count': int,
'genres': ['Other'],
'uploader_id': 'user8353034818103753',
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/51b18363-da23-4b9b-a29c-2933a3e561ca/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/51b18363-da23-4b9b-a29c-2933a3e561ca/',
'timestamp': 1709625771,
'track': 'PodcastMaerchen4b',
'duration': 468.14,
@@ -178,7 +178,7 @@ class BandlabIE(BandlabBaseIE):
'id': '110343fc-148b-ea11-96d2-0003ffd1fc09',
'ext': 'm4a',
'timestamp': 1588273294,
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/users/b612e533-e4f7-4542-9f50-3fcfd8dd822c/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/users/b612e533-e4f7-4542-9f50-3fcfd8dd822c/',
'description': 'Final Revision.',
'title': 'Replay ( Instrumental)',
'uploader': 'David R Sparks',
@@ -200,7 +200,7 @@ class BandlabIE(BandlabBaseIE):
'id': '5cdf9036-3857-ef11-991a-6045bd36e0d9',
'ext': 'mp4',
'duration': 44.705,
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/videos/67c6cef1-cef6-40d3-831e-a55bc1dcb972/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/videos/67c6cef1-cef6-40d3-831e-a55bc1dcb972/',
'comment_count': int,
'title': 'backing vocals',
'uploader_id': 'marliashya',
@@ -224,7 +224,7 @@ class BandlabIE(BandlabBaseIE):
'view_count': int,
'track': 'Positronic Meltdown',
'duration': 318.55,
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/87165bc3-5439-496e-b1f7-a9f13b541ff2/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/87165bc3-5439-496e-b1f7-a9f13b541ff2/',
'description': 'Checkout my tracks at AOMX http://aomxsounds.com/',
'uploader_id': 'microfreaks',
'title': 'Positronic Meltdown',
@@ -246,7 +246,7 @@ class BandlabIE(BandlabBaseIE):
'comment_count': int,
'uploader': 'Sorakime',
'uploader_id': 'sorakime',
- 'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/users/572a351a-0f3a-4c6a-ac39-1a5defdeeb1c/',
+ 'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/users/572a351a-0f3a-4c6a-ac39-1a5defdeeb1c/',
'timestamp': 1691162128,
'upload_date': '20230804',
'media_type': 'track',
diff --git a/yt_dlp/extractor/bilibili.py b/yt_dlp/extractor/bilibili.py
index 42b4e2d3c2..6508942a4f 100644
--- a/yt_dlp/extractor/bilibili.py
+++ b/yt_dlp/extractor/bilibili.py
@@ -1596,16 +1596,16 @@ class BilibiliPlaylistIE(BilibiliSpaceListBaseIE):
webpage = self._download_webpage(url, list_id)
initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', list_id)
- if traverse_obj(initial_state, ('error', 'code', {int_or_none})) != 200:
- error_code = traverse_obj(initial_state, ('error', 'trueCode', {int_or_none}))
- error_message = traverse_obj(initial_state, ('error', 'message', {str_or_none}))
+ error = traverse_obj(initial_state, (('error', 'listError'), all, lambda _, v: v['code'], any))
+ if error and error['code'] != 200:
+ error_code = error.get('trueCode')
if error_code == -400 and list_id == 'watchlater':
self.raise_login_required('You need to login to access your watchlater playlist')
elif error_code == -403:
self.raise_login_required('This is a private playlist. You need to login as its owner')
elif error_code == 11010:
raise ExtractorError('Playlist is no longer available', expected=True)
- raise ExtractorError(f'Could not access playlist: {error_code} {error_message}')
+ raise ExtractorError(f'Could not access playlist: {error_code} {error.get("message")}')
query = {
'ps': 20,
diff --git a/yt_dlp/extractor/bluesky.py b/yt_dlp/extractor/bluesky.py
index 23344ac6c5..8cb5c0d257 100644
--- a/yt_dlp/extractor/bluesky.py
+++ b/yt_dlp/extractor/bluesky.py
@@ -53,7 +53,7 @@ class BlueskyIE(InfoExtractor):
'channel_id': 'did:plc:z72i7hdynmk6r22z27h6tvur',
'channel_url': 'https://bsky.app/profile/did:plc:z72i7hdynmk6r22z27h6tvur',
'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
- 'title': 'Bluesky now has video! Update your app to versi...',
+ 'title': 'Bluesky now has video! Update your app to version 1.91 or refresh on ...',
'alt_title': 'Bluesky video feature announcement',
'description': r're:(?s)Bluesky now has video! .{239}',
'upload_date': '20240911',
@@ -172,7 +172,7 @@ class BlueskyIE(InfoExtractor):
'channel_id': 'did:plc:z72i7hdynmk6r22z27h6tvur',
'channel_url': 'https://bsky.app/profile/did:plc:z72i7hdynmk6r22z27h6tvur',
'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
- 'title': 'Bluesky now has video! Update your app to versi...',
+ 'title': 'Bluesky now has video! Update your app to version 1.91 or refresh on ...',
'alt_title': 'Bluesky video feature announcement',
'description': r're:(?s)Bluesky now has video! .{239}',
'upload_date': '20240911',
@@ -191,7 +191,7 @@ class BlueskyIE(InfoExtractor):
'info_dict': {
'id': '3l7rdfxhyds2f',
'ext': 'mp4',
- 'uploader': 'cinnamon',
+ 'uploader': 'cinnamon 🐇 🏳️⚧️',
'uploader_id': 'cinny.bun.how',
'uploader_url': 'https://bsky.app/profile/cinny.bun.how',
'channel_id': 'did:plc:7x6rtuenkuvxq3zsvffp2ide',
@@ -255,7 +255,7 @@ class BlueskyIE(InfoExtractor):
'info_dict': {
'id': '3l77u64l7le2e',
'ext': 'mp4',
- 'title': 'hearing people on twitter say that bluesky isn\'...',
+ 'title': "hearing people on twitter say that bluesky isn't funny yet so post t...",
'like_count': int,
'uploader_id': 'thafnine.net',
'uploader_url': 'https://bsky.app/profile/thafnine.net',
@@ -387,7 +387,7 @@ class BlueskyIE(InfoExtractor):
'age_limit': (
'labels', ..., 'val', {lambda x: 18 if x in ('sexual', 'porn', 'graphic-media') else None}, any),
'description': (*record_path, 'text', {str}, filter),
- 'title': (*record_path, 'text', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=50)}),
+ 'title': (*record_path, 'text', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}),
}),
})
return entries
diff --git a/yt_dlp/extractor/chzzk.py b/yt_dlp/extractor/chzzk.py
index aec77ac454..a5daf5ca7c 100644
--- a/yt_dlp/extractor/chzzk.py
+++ b/yt_dlp/extractor/chzzk.py
@@ -21,7 +21,7 @@ class CHZZKLiveIE(InfoExtractor):
'channel': '진짜도현',
'channel_id': 'c68b8ef525fb3d2fa146344d84991753',
'channel_is_verified': False,
- 'thumbnail': r're:^https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.+/.+\.jpg',
'timestamp': 1705510344,
'upload_date': '20240117',
'live_status': 'is_live',
@@ -98,7 +98,7 @@ class CHZZKVideoIE(InfoExtractor):
'channel': '침착맨',
'channel_id': 'bb382c2c0cc9fa7c86ab3b037fb5799c',
'channel_is_verified': False,
- 'thumbnail': r're:^https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.+/.+\.jpg',
'duration': 15577,
'timestamp': 1702970505.417,
'upload_date': '20231219',
@@ -115,7 +115,7 @@ class CHZZKVideoIE(InfoExtractor):
'channel': '라디유radiyu',
'channel_id': '68f895c59a1043bc5019b5e08c83a5c5',
'channel_is_verified': False,
- 'thumbnail': r're:^https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.+/.+\.jpg',
'duration': 95,
'timestamp': 1703102631.722,
'upload_date': '20231220',
@@ -131,12 +131,30 @@ class CHZZKVideoIE(InfoExtractor):
'channel': '강지',
'channel_id': 'b5ed5db484d04faf4d150aedd362f34b',
'channel_is_verified': True,
- 'thumbnail': r're:^https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.+/.+\.jpg',
'duration': 4433,
'timestamp': 1703307460.214,
'upload_date': '20231223',
'view_count': int,
},
+ }, {
+ # video_status == 'NONE' but is downloadable
+ 'url': 'https://chzzk.naver.com/video/6325166',
+ 'info_dict': {
+ 'id': '6325166',
+ 'ext': 'mp4',
+ 'title': '와이프 숙제빼주기',
+ 'channel': '이 다',
+ 'channel_id': '0076a519f147ee9fd0959bf02f9571ca',
+ 'channel_is_verified': False,
+ 'view_count': int,
+ 'duration': 28167,
+ 'thumbnail': r're:https?://.+/.+\.jpg',
+ 'timestamp': 1742139216.86,
+ 'upload_date': '20250316',
+ 'live_status': 'was_live',
+ },
+ 'params': {'skip_download': 'm3u8'},
}]
def _real_extract(self, url):
@@ -147,11 +165,7 @@ class CHZZKVideoIE(InfoExtractor):
live_status = 'was_live' if video_meta.get('liveOpenDate') else 'not_live'
video_status = video_meta.get('vodStatus')
- if video_status == 'UPLOAD':
- playback = self._parse_json(video_meta['liveRewindPlaybackJson'], video_id)
- formats, subtitles = self._extract_m3u8_formats_and_subtitles(
- playback['media'][0]['path'], video_id, 'mp4', m3u8_id='hls')
- elif video_status == 'ABR_HLS':
+ if video_status == 'ABR_HLS':
formats, subtitles = self._extract_mpd_formats_and_subtitles(
f'https://apis.naver.com/neonplayer/vodplay/v1/playback/{video_meta["videoId"]}',
video_id, query={
@@ -161,10 +175,17 @@ class CHZZKVideoIE(InfoExtractor):
'cpl': 'en_US',
})
else:
- self.raise_no_formats(
- f'Unknown video status detected: "{video_status}"', expected=True, video_id=video_id)
- formats, subtitles = [], {}
- live_status = 'post_live' if live_status == 'was_live' else None
+ fatal = video_status == 'UPLOAD'
+ playback = self._parse_json(video_meta['liveRewindPlaybackJson'], video_id, fatal=fatal)
+ formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+ traverse_obj(playback, ('media', 0, 'path')), video_id, 'mp4', m3u8_id='hls', fatal=fatal)
+ if formats and video_status != 'UPLOAD':
+ self.write_debug(f'Video found with status: "{video_status}"')
+ elif not formats:
+ self.raise_no_formats(
+ f'Unknown video status detected: "{video_status}"', expected=True, video_id=video_id)
+ formats, subtitles = [], {}
+ live_status = 'post_live' if live_status == 'was_live' else None
return {
'id': video_id,
diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py
index b816d788fa..0119111816 100644
--- a/yt_dlp/extractor/common.py
+++ b/yt_dlp/extractor/common.py
@@ -2935,8 +2935,7 @@ class InfoExtractor:
segment_duration = None
if 'total_number' not in representation_ms_info and 'segment_duration' in representation_ms_info:
segment_duration = float_or_none(representation_ms_info['segment_duration'], representation_ms_info['timescale'])
- representation_ms_info['total_number'] = int(math.ceil(
- float_or_none(period_duration, segment_duration, default=0)))
+ representation_ms_info['total_number'] = math.ceil(float_or_none(period_duration, segment_duration, default=0))
representation_ms_info['fragments'] = [{
media_location_key: media_template % {
'Number': segment_number,
diff --git a/yt_dlp/extractor/deezer.py b/yt_dlp/extractor/deezer.py
deleted file mode 100644
index 2ca8be5ca0..0000000000
--- a/yt_dlp/extractor/deezer.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import json
-
-from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
- int_or_none,
- orderedSet,
-)
-
-
-class DeezerBaseInfoExtractor(InfoExtractor):
- def get_data(self, url):
- if not self.get_param('test'):
- self.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
-
- mobj = self._match_valid_url(url)
- data_id = mobj.group('id')
-
- webpage = self._download_webpage(url, data_id)
- geoblocking_msg = self._html_search_regex(
- r'(.*?)
', webpage, 'geoblocking message',
- default=None)
- if geoblocking_msg is not None:
- raise ExtractorError(
- f'Deezer said: {geoblocking_msg}', expected=True)
-
- data_json = self._search_regex(
- (r'__DZR_APP_STATE__\s*=\s*({.+?})\s*',
- r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n'),
- webpage, 'data JSON')
- data = json.loads(data_json)
- return data_id, webpage, data
-
-
-class DeezerPlaylistIE(DeezerBaseInfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?playlist/(?P[0-9]+)'
- _TEST = {
- 'url': 'http://www.deezer.com/playlist/176747451',
- 'info_dict': {
- 'id': '176747451',
- 'title': 'Best!',
- 'uploader': 'anonymous',
- 'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
- },
- 'playlist_count': 29,
- }
-
- def _real_extract(self, url):
- playlist_id, webpage, data = self.get_data(url)
-
- playlist_title = data.get('DATA', {}).get('TITLE')
- playlist_uploader = data.get('DATA', {}).get('PARENT_USERNAME')
- playlist_thumbnail = self._search_regex(
- r'![]()
[0-9]+)'
- _TEST = {
- 'url': 'https://www.deezer.com/fr/album/67505622',
- 'info_dict': {
- 'id': '67505622',
- 'title': 'Last Week',
- 'uploader': 'Home Brew',
- 'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
- },
- 'playlist_count': 7,
- }
-
- def _real_extract(self, url):
- album_id, webpage, data = self.get_data(url)
-
- album_title = data.get('DATA', {}).get('ALB_TITLE')
- album_uploader = data.get('DATA', {}).get('ART_NAME')
- album_thumbnail = self._search_regex(
- r'![]()
streamers|stream)/(?P[^/?#]+)'
+ _TESTS = [{
+ 'url': 'https://loco.com/streamers/teuzinfps',
+ 'info_dict': {
+ 'id': 'teuzinfps',
+ 'ext': 'mp4',
+ 'title': r're:MS BOLADAO, RESENHA & GAMEPLAY ALTO NIVEL',
+ 'description': 'bom e novo',
+ 'uploader_id': 'RLUVE3S9JU',
+ 'channel': 'teuzinfps',
+ 'channel_follower_count': int,
+ 'comment_count': int,
+ 'view_count': int,
+ 'concurrent_view_count': int,
+ 'like_count': int,
+ 'thumbnail': 'https://static.ivory.getloconow.com/default_thumb/743701a9-98ca-41ae-9a8b-70bd5da070ad.jpg',
+ 'tags': ['MMORPG', 'Gameplay'],
+ 'series': 'Tibia',
+ 'timestamp': int,
+ 'modified_timestamp': int,
+ 'live_status': 'is_live',
+ 'upload_date': str,
+ 'modified_date': str,
+ },
+ 'params': {
+ 'skip_download': 'Livestream',
+ },
+ }, {
+ 'url': 'https://loco.com/stream/c64916eb-10fb-46a9-9a19-8c4b7ed064e7',
+ 'md5': '45ebc8a47ee1c2240178757caf8881b5',
+ 'info_dict': {
+ 'id': 'c64916eb-10fb-46a9-9a19-8c4b7ed064e7',
+ 'ext': 'mp4',
+ 'title': 'PAULINHO LOKO NA LOCO!',
+ 'description': 'live on na loco',
+ 'uploader_id': '2MDO7Z1DPM',
+ 'channel': 'paulinholokobr',
+ 'channel_follower_count': int,
+ 'comment_count': int,
+ 'view_count': int,
+ 'concurrent_view_count': int,
+ 'like_count': int,
+ 'duration': 14491,
+ 'thumbnail': 'https://static.ivory.getloconow.com/default_thumb/59b5970b-23c1-4518-9e96-17ce341299fe.jpg',
+ 'tags': ['Gameplay'],
+ 'series': 'GTA 5',
+ 'timestamp': 1740612872,
+ 'modified_timestamp': 1740613037,
+ 'upload_date': '20250226',
+ 'modified_date': '20250226',
+ },
+ }]
+
+ def _real_extract(self, url):
+ video_type, video_id = self._match_valid_url(url).group('type', 'id')
+ webpage = self._download_webpage(url, video_id)
+ stream = traverse_obj(self._search_nextjs_data(webpage, video_id), (
+ 'props', 'pageProps', ('liveStreamData', 'stream'), {dict}, any, {require('stream info')}))
+
+ return {
+ 'formats': self._extract_m3u8_formats(stream['conf']['hls'], video_id),
+ 'id': video_id,
+ 'is_live': video_type == 'streamers',
+ **traverse_obj(stream, {
+ 'title': ('title', {str}),
+ 'series': ('game_name', {str}),
+ 'uploader_id': ('user_uid', {str}),
+ 'channel': ('alias', {str}),
+ 'description': ('description', {str}),
+ 'concurrent_view_count': ('viewersCurrent', {int_or_none}),
+ 'view_count': ('total_views', {int_or_none}),
+ 'thumbnail': ('thumbnail_url_small', {url_or_none}),
+ 'like_count': ('likes', {int_or_none}),
+ 'tags': ('tags', ..., {str}),
+ 'timestamp': ('started_at', {int_or_none(scale=1000)}),
+ 'modified_timestamp': ('updated_at', {int_or_none(scale=1000)}),
+ 'comment_count': ('comments_count', {int_or_none}),
+ 'channel_follower_count': ('followers_count', {int_or_none}),
+ 'duration': ('duration', {int_or_none}),
+ }),
+ }
diff --git a/yt_dlp/extractor/medaltv.py b/yt_dlp/extractor/medaltv.py
index d64dbfe638..94c51ed0e7 100644
--- a/yt_dlp/extractor/medaltv.py
+++ b/yt_dlp/extractor/medaltv.py
@@ -102,11 +102,10 @@ class MedalTVIE(InfoExtractor):
item_id = item_id or '%dp' % height
if item_id not in item_url:
return
- width = int(round(aspect_ratio * height))
container.append({
'url': item_url,
id_key: item_id,
- 'width': width,
+ 'width': round(aspect_ratio * height),
'height': height,
})
diff --git a/yt_dlp/extractor/mitele.py b/yt_dlp/extractor/mitele.py
index 76fef337a2..55fa83b51f 100644
--- a/yt_dlp/extractor/mitele.py
+++ b/yt_dlp/extractor/mitele.py
@@ -1,5 +1,7 @@
from .telecinco import TelecincoBaseIE
+from ..networking.exceptions import HTTPError
from ..utils import (
+ ExtractorError,
int_or_none,
parse_iso8601,
)
@@ -79,7 +81,17 @@ class MiTeleIE(TelecincoBaseIE):
def _real_extract(self, url):
display_id = self._match_id(url)
- webpage = self._download_webpage(url, display_id)
+
+ try: # yt-dlp's default user-agents are too old and blocked by akamai
+ webpage = self._download_webpage(url, display_id, headers={
+ 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:136.0) Gecko/20100101 Firefox/136.0',
+ })
+ except ExtractorError as e:
+ if not isinstance(e.cause, HTTPError) or e.cause.status != 403:
+ raise
+ # Retry with impersonation if hardcoded UA is insufficient to bypass akamai
+ webpage = self._download_webpage(url, display_id, impersonate=True)
+
pre_player = self._search_json(
r'window\.\$REACTBASE_STATE\.prePlayer_mtweb\s*=',
webpage, 'Pre Player', display_id)['prePlayer']
diff --git a/yt_dlp/extractor/ninenow.py b/yt_dlp/extractor/ninenow.py
index f17531e622..7b0cb77a74 100644
--- a/yt_dlp/extractor/ninenow.py
+++ b/yt_dlp/extractor/ninenow.py
@@ -1,34 +1,46 @@
+import json
+import re
+
+from .brightcove import BrightcoveNewIE
from .common import InfoExtractor
from ..utils import (
- ExtractorError,
float_or_none,
int_or_none,
- smuggle_url,
+ parse_iso8601,
+ parse_resolution,
str_or_none,
- try_get,
- unified_strdate,
- unified_timestamp,
+ url_or_none,
)
+from ..utils.traversal import require, traverse_obj, value
class NineNowIE(InfoExtractor):
IE_NAME = '9now.com.au'
- _VALID_URL = r'https?://(?:www\.)?9now\.com\.au/(?:[^/]+/){2}(?P[^/?#]+)'
- _GEO_COUNTRIES = ['AU']
+ _VALID_URL = r'https?://(?:www\.)?9now\.com\.au/(?:[^/?#]+/){2}(?P(?Pclip|episode)-[^/?#]+)'
+ _GEO_BYPASS = False
_TESTS = [{
# clip
- 'url': 'https://www.9now.com.au/afl-footy-show/2016/clip-ciql02091000g0hp5oktrnytc',
- 'md5': '17cf47d63ec9323e562c9957a968b565',
+ 'url': 'https://www.9now.com.au/today/season-2025/clip-cm8hw9h5z00080hquqa5hszq7',
'info_dict': {
- 'id': '16801',
+ 'id': '6370295582112',
'ext': 'mp4',
- 'title': 'St. Kilda\'s Joey Montagna on the potential for a player\'s strike',
- 'description': 'Is a boycott of the NAB Cup "on the table"?',
+ 'title': 'Would Karl Stefanovic be able to land a plane?',
+ 'description': 'The Today host\'s skills are put to the test with the latest simulation tech.',
'uploader_id': '4460760524001',
- 'upload_date': '20160713',
- 'timestamp': 1468421266,
+ 'duration': 197.376,
+ 'tags': ['flights', 'technology', 'Karl Stefanovic'],
+ 'season': 'Season 2025',
+ 'season_number': 2025,
+ 'series': 'TODAY',
+ 'timestamp': 1742507988,
+ 'upload_date': '20250320',
+ 'release_timestamp': 1742507983,
+ 'release_date': '20250320',
+ 'thumbnail': r're:https?://.+/1920x0/.+\.jpg',
+ },
+ 'params': {
+ 'skip_download': 'HLS/DASH fragments and mp4 URLs are geo-restricted; only available in AU',
},
- 'skip': 'Only available in Australia',
}, {
# episode
'url': 'https://www.9now.com.au/afl-footy-show/2016/episode-19',
@@ -41,7 +53,7 @@ class NineNowIE(InfoExtractor):
# episode of series
'url': 'https://www.9now.com.au/lego-masters/season-3/episode-3',
'info_dict': {
- 'id': '6249614030001',
+ 'id': '6308830406112',
'title': 'Episode 3',
'ext': 'mp4',
'season_number': 3,
@@ -50,72 +62,87 @@ class NineNowIE(InfoExtractor):
'uploader_id': '4460760524001',
'timestamp': 1619002200,
'upload_date': '20210421',
+ 'duration': 3574.085,
+ 'thumbnail': r're:https?://.+/1920x0/.+\.jpg',
+ 'tags': ['episode'],
+ 'series': 'Lego Masters',
+ 'season': 'Season 3',
+ 'episode': 'Episode 3',
+ 'release_timestamp': 1619002200,
+ 'release_date': '20210421',
+ },
+ 'params': {
+ 'skip_download': 'HLS/DASH fragments and mp4 URLs are geo-restricted; only available in AU',
+ },
+ }, {
+ 'url': 'https://www.9now.com.au/married-at-first-sight/season-12/episode-1',
+ 'info_dict': {
+ 'id': '6367798770112',
+ 'ext': 'mp4',
+ 'title': 'Episode 1',
+ 'description': r're:The cultural sensation of Married At First Sight returns with our first weddings! .{90}$',
+ 'uploader_id': '4460760524001',
+ 'duration': 5415.079,
+ 'thumbnail': r're:https?://.+/1920x0/.+\.png',
+ 'tags': ['episode'],
+ 'season': 'Season 12',
+ 'season_number': 12,
+ 'episode': 'Episode 1',
+ 'episode_number': 1,
+ 'series': 'Married at First Sight',
+ 'timestamp': 1737973800,
+ 'upload_date': '20250127',
+ 'release_timestamp': 1737973800,
+ 'release_date': '20250127',
},
- 'expected_warnings': ['Ignoring subtitle tracks'],
'params': {
- 'skip_download': True,
+ 'skip_download': 'HLS/DASH fragments and mp4 URLs are geo-restricted; only available in AU',
},
}]
- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId=%s'
+ BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId={}'
+
+ # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.francetv and yt_dlp.extractor.goplay
+ def _find_json(self, s):
+ return self._search_json(
+ r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
def _real_extract(self, url):
- display_id = self._match_id(url)
+ display_id, video_type = self._match_valid_url(url).group('id', 'type')
webpage = self._download_webpage(url, display_id)
- page_data = self._parse_json(self._search_regex(
- r'window\.__data\s*=\s*({.*?});', webpage,
- 'page data', default='{}'), display_id, fatal=False)
- if not page_data:
- page_data = self._parse_json(self._parse_json(self._search_regex(
- r'window\.__data\s*=\s*JSON\.parse\s*\(\s*(".+?")\s*\)\s*;',
- webpage, 'page data'), display_id), display_id)
- for kind in ('episode', 'clip'):
- current_key = page_data.get(kind, {}).get(
- f'current{kind.capitalize()}Key')
- if not current_key:
- continue
- cache = page_data.get(kind, {}).get(f'{kind}Cache', {})
- if not cache:
- continue
- common_data = {
- 'episode': (cache.get(current_key) or next(iter(cache.values())))[kind],
- 'season': (cache.get(current_key) or next(iter(cache.values()))).get('season', None),
- }
- break
- else:
- raise ExtractorError('Unable to find video data')
+ common_data = traverse_obj(
+ re.findall(r']*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*', webpage),
+ (..., {json.loads}, ..., {self._find_json},
+ lambda _, v: v['payload'][video_type]['slug'] == display_id,
+ 'payload', any, {require('video data')}))
- if not self.get_param('allow_unplayable_formats') and try_get(common_data, lambda x: x['episode']['video']['drm'], bool):
+ if traverse_obj(common_data, (video_type, 'video', 'drm', {bool})):
self.report_drm(display_id)
- brightcove_id = try_get(
- common_data, lambda x: x['episode']['video']['brightcoveId'], str) or 'ref:{}'.format(common_data['episode']['video']['referenceId'])
- video_id = str_or_none(try_get(common_data, lambda x: x['episode']['video']['id'])) or brightcove_id
-
- title = try_get(common_data, lambda x: x['episode']['name'], str)
- season_number = try_get(common_data, lambda x: x['season']['seasonNumber'], int)
- episode_number = try_get(common_data, lambda x: x['episode']['episodeNumber'], int)
- timestamp = unified_timestamp(try_get(common_data, lambda x: x['episode']['airDate'], str))
- release_date = unified_strdate(try_get(common_data, lambda x: x['episode']['availability'], str))
- thumbnails_data = try_get(common_data, lambda x: x['episode']['image']['sizes'], dict) or {}
- thumbnails = [{
- 'id': thumbnail_id,
- 'url': thumbnail_url,
- 'width': int_or_none(thumbnail_id[1:]),
- } for thumbnail_id, thumbnail_url in thumbnails_data.items()]
+ brightcove_id = traverse_obj(common_data, (
+ video_type, 'video', (
+ ('brightcoveId', {str}),
+ ('referenceId', {str}, {lambda x: f'ref:{x}' if x else None}),
+ ), any, {require('brightcove ID')}))
return {
'_type': 'url_transparent',
- 'url': smuggle_url(
- self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
- {'geo_countries': self._GEO_COUNTRIES}),
- 'id': video_id,
- 'title': title,
- 'description': try_get(common_data, lambda x: x['episode']['description'], str),
- 'duration': float_or_none(try_get(common_data, lambda x: x['episode']['video']['duration'], float), 1000),
- 'thumbnails': thumbnails,
- 'ie_key': 'BrightcoveNew',
- 'season_number': season_number,
- 'episode_number': episode_number,
- 'timestamp': timestamp,
- 'release_date': release_date,
+ 'ie_key': BrightcoveNewIE.ie_key(),
+ 'url': self.BRIGHTCOVE_URL_TEMPLATE.format(brightcove_id),
+ **traverse_obj(common_data, {
+ 'id': (video_type, 'video', 'id', {int}, ({str_or_none}, {value(brightcove_id)}), any),
+ 'title': (video_type, 'name', {str}),
+ 'description': (video_type, 'description', {str}),
+ 'duration': (video_type, 'video', 'duration', {float_or_none(scale=1000)}),
+ 'tags': (video_type, 'tags', ..., 'name', {str}, all, filter),
+ 'series': ('tvSeries', 'name', {str}),
+ 'season_number': ('season', 'seasonNumber', {int_or_none}),
+ 'episode_number': ('episode', 'episodeNumber', {int_or_none}),
+ 'timestamp': ('episode', 'airDate', {parse_iso8601}),
+ 'release_timestamp': (video_type, 'availability', {parse_iso8601}),
+ 'thumbnails': (video_type, 'image', 'sizes', {dict.items}, lambda _, v: url_or_none(v[1]), {
+ 'id': 0,
+ 'url': 1,
+ 'width': (1, {parse_resolution}, 'width'),
+ }),
+ }),
}
diff --git a/yt_dlp/extractor/telecinco.py b/yt_dlp/extractor/telecinco.py
index 9ef621446d..a34f2afd4a 100644
--- a/yt_dlp/extractor/telecinco.py
+++ b/yt_dlp/extractor/telecinco.py
@@ -46,7 +46,7 @@ class TelecincoBaseIE(InfoExtractor):
error_code = traverse_obj(
self._webpage_read_content(error.cause.response, caronte['cerbero'], video_id, fatal=False),
({json.loads}, 'code', {int}))
- if error_code == 4038:
+ if error_code in (4038, 40313):
self.raise_geo_restricted(countries=['ES'])
raise
diff --git a/yt_dlp/extractor/unsupported.py b/yt_dlp/extractor/unsupported.py
index e8d6ae1289..31393b02a4 100644
--- a/yt_dlp/extractor/unsupported.py
+++ b/yt_dlp/extractor/unsupported.py
@@ -51,6 +51,8 @@ class KnownDRMIE(UnsupportedInfoExtractor):
r'(?:watch|front)\.njpwworld\.com',
r'qub\.ca/vrai',
r'(?:beta\.)?crunchyroll\.com',
+ r'viki\.com',
+ r'deezer\.com',
)
_TESTS = [{
@@ -160,6 +162,12 @@ class KnownDRMIE(UnsupportedInfoExtractor):
}, {
'url': 'https://beta.crunchyroll.com/pt-br/watch/G8WUN8VKP/the-ruler-of-conspiracy',
'only_matching': True,
+ }, {
+ 'url': 'https://www.viki.com/videos/1175236v-choosing-spouse-by-lottery-episode-1',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.deezer.com/playlist/176747451',
+ 'only_matching': True,
}]
def _real_extract(self, url):
diff --git a/yt_dlp/extractor/viki.py b/yt_dlp/extractor/viki.py
deleted file mode 100644
index 75f9cdf2ff..0000000000
--- a/yt_dlp/extractor/viki.py
+++ /dev/null
@@ -1,346 +0,0 @@
-import hashlib
-import hmac
-import json
-import time
-
-from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
- int_or_none,
- parse_age_limit,
- parse_iso8601,
- try_get,
-)
-
-
-class VikiBaseIE(InfoExtractor):
- _VALID_URL_BASE = r'https?://(?:www\.)?viki\.(?:com|net|mx|jp|fr)/'
- _API_URL_TEMPLATE = 'https://api.viki.io%s'
-
- _DEVICE_ID = '112395910d'
- _APP = '100005a'
- _APP_VERSION = '6.11.3'
- _APP_SECRET = 'd96704b180208dbb2efa30fe44c48bd8690441af9f567ba8fd710a72badc85198f7472'
-
- _GEO_BYPASS = False
- _NETRC_MACHINE = 'viki'
-
- _token = None
-
- _ERRORS = {
- 'geo': 'Sorry, this content is not available in your region.',
- 'upcoming': 'Sorry, this content is not yet available.',
- 'paywall': 'Sorry, this content is only available to Viki Pass Plus subscribers',
- }
-
- def _stream_headers(self, timestamp, sig):
- return {
- 'X-Viki-manufacturer': 'vivo',
- 'X-Viki-device-model': 'vivo 1606',
- 'X-Viki-device-os-ver': '6.0.1',
- 'X-Viki-connection-type': 'WIFI',
- 'X-Viki-carrier': '',
- 'X-Viki-as-id': '100005a-1625321982-3932',
- 'timestamp': str(timestamp),
- 'signature': str(sig),
- 'x-viki-app-ver': self._APP_VERSION,
- }
-
- def _api_query(self, path, version=4, **kwargs):
- path += '?' if '?' not in path else '&'
- query = f'/v{version}/{path}app={self._APP}'
- if self._token:
- query += f'&token={self._token}'
- return query + ''.join(f'&{name}={val}' for name, val in kwargs.items())
-
- def _sign_query(self, path):
- timestamp = int(time.time())
- query = self._api_query(path, version=5)
- sig = hmac.new(
- self._APP_SECRET.encode('ascii'), f'{query}&t={timestamp}'.encode('ascii'), hashlib.sha1).hexdigest()
- return timestamp, sig, self._API_URL_TEMPLATE % query
-
- def _call_api(
- self, path, video_id, note='Downloading JSON metadata', data=None, query=None, fatal=True):
- if query is None:
- timestamp, sig, url = self._sign_query(path)
- else:
- url = self._API_URL_TEMPLATE % self._api_query(path, version=4)
- resp = self._download_json(
- url, video_id, note, fatal=fatal, query=query,
- data=json.dumps(data).encode() if data else None,
- headers=({'x-viki-app-ver': self._APP_VERSION} if data
- else self._stream_headers(timestamp, sig) if query is None
- else None), expected_status=400) or {}
-
- self._raise_error(resp.get('error'), fatal)
- return resp
-
- def _raise_error(self, error, fatal=True):
- if error is None:
- return
- msg = f'{self.IE_NAME} said: {error}'
- if fatal:
- raise ExtractorError(msg, expected=True)
- else:
- self.report_warning(msg)
-
- def _check_errors(self, data):
- for reason, status in (data.get('blocking') or {}).items():
- if status and reason in self._ERRORS:
- message = self._ERRORS[reason]
- if reason == 'geo':
- self.raise_geo_restricted(msg=message)
- elif reason == 'paywall':
- if try_get(data, lambda x: x['paywallable']['tvod']):
- self._raise_error('This video is for rent only or TVOD (Transactional Video On demand)')
- self.raise_login_required(message)
- self._raise_error(message)
-
- def _perform_login(self, username, password):
- self._token = self._call_api(
- 'sessions.json', None, 'Logging in', fatal=False,
- data={'username': username, 'password': password}).get('token')
- if not self._token:
- self.report_warning('Login Failed: Unable to get session token')
-
- @staticmethod
- def dict_selection(dict_obj, preferred_key):
- if preferred_key in dict_obj:
- return dict_obj[preferred_key]
- return (list(filter(None, dict_obj.values())) or [None])[0]
-
-
-class VikiIE(VikiBaseIE):
- IE_NAME = 'viki'
- _VALID_URL = rf'{VikiBaseIE._VALID_URL_BASE}(?:videos|player)/(?P[0-9]+v)'
- _TESTS = [{
- 'note': 'Free non-DRM video with storyboards in MPD',
- 'url': 'https://www.viki.com/videos/1175236v-choosing-spouse-by-lottery-episode-1',
- 'info_dict': {
- 'id': '1175236v',
- 'ext': 'mp4',
- 'title': 'Choosing Spouse by Lottery - Episode 1',
- 'timestamp': 1606463239,
- 'age_limit': 13,
- 'uploader': 'FCC',
- 'upload_date': '20201127',
- },
- }, {
- 'url': 'http://www.viki.com/videos/1023585v-heirs-episode-14',
- 'info_dict': {
- 'id': '1023585v',
- 'ext': 'mp4',
- 'title': 'Heirs - Episode 14',
- 'uploader': 'SBS Contents Hub',
- 'timestamp': 1385047627,
- 'upload_date': '20131121',
- 'age_limit': 13,
- 'duration': 3570,
- 'episode_number': 14,
- },
- 'skip': 'Blocked in the US',
- }, {
- # clip
- 'url': 'http://www.viki.com/videos/1067139v-the-avengers-age-of-ultron-press-conference',
- 'md5': '86c0b5dbd4d83a6611a79987cc7a1989',
- 'info_dict': {
- 'id': '1067139v',
- 'ext': 'mp4',
- 'title': "'The Avengers: Age of Ultron' Press Conference",
- 'description': 'md5:d70b2f9428f5488321bfe1db10d612ea',
- 'duration': 352,
- 'timestamp': 1430380829,
- 'upload_date': '20150430',
- 'uploader': 'Arirang TV',
- 'like_count': int,
- 'age_limit': 0,
- },
- 'skip': 'Sorry. There was an error loading this video',
- }, {
- 'url': 'http://www.viki.com/videos/1048879v-ankhon-dekhi',
- 'info_dict': {
- 'id': '1048879v',
- 'ext': 'mp4',
- 'title': 'Ankhon Dekhi',
- 'duration': 6512,
- 'timestamp': 1408532356,
- 'upload_date': '20140820',
- 'uploader': 'Spuul',
- 'like_count': int,
- 'age_limit': 13,
- },
- 'skip': 'Blocked in the US',
- }, {
- # episode
- 'url': 'http://www.viki.com/videos/44699v-boys-over-flowers-episode-1',
- 'md5': '0a53dc252e6e690feccd756861495a8c',
- 'info_dict': {
- 'id': '44699v',
- 'ext': 'mp4',
- 'title': 'Boys Over Flowers - Episode 1',
- 'description': 'md5:b89cf50038b480b88b5b3c93589a9076',
- 'duration': 4172,
- 'timestamp': 1270496524,
- 'upload_date': '20100405',
- 'uploader': 'group8',
- 'like_count': int,
- 'age_limit': 13,
- 'episode_number': 1,
- },
- }, {
- # youtube external
- 'url': 'http://www.viki.com/videos/50562v-poor-nastya-complete-episode-1',
- 'md5': '63f8600c1da6f01b7640eee7eca4f1da',
- 'info_dict': {
- 'id': '50562v',
- 'ext': 'webm',
- 'title': 'Poor Nastya [COMPLETE] - Episode 1',
- 'description': '',
- 'duration': 606,
- 'timestamp': 1274949505,
- 'upload_date': '20101213',
- 'uploader': 'ad14065n',
- 'uploader_id': 'ad14065n',
- 'like_count': int,
- 'age_limit': 13,
- },
- 'skip': 'Page not found!',
- }, {
- 'url': 'http://www.viki.com/player/44699v',
- 'only_matching': True,
- }, {
- # non-English description
- 'url': 'http://www.viki.com/videos/158036v-love-in-magic',
- 'md5': '41faaba0de90483fb4848952af7c7d0d',
- 'info_dict': {
- 'id': '158036v',
- 'ext': 'mp4',
- 'uploader': 'I Planet Entertainment',
- 'upload_date': '20111122',
- 'timestamp': 1321985454,
- 'description': 'md5:44b1e46619df3a072294645c770cef36',
- 'title': 'Love In Magic',
- 'age_limit': 13,
- },
- }]
-
- def _real_extract(self, url):
- video_id = self._match_id(url)
- video = self._call_api(f'videos/{video_id}.json', video_id, 'Downloading video JSON', query={})
- self._check_errors(video)
-
- title = try_get(video, lambda x: x['titles']['en'], str)
- episode_number = int_or_none(video.get('number'))
- if not title:
- title = f'Episode {episode_number}' if video.get('type') == 'episode' else video.get('id') or video_id
- container_titles = try_get(video, lambda x: x['container']['titles'], dict) or {}
- container_title = self.dict_selection(container_titles, 'en')
- title = f'{container_title} - {title}'
-
- thumbnails = [{
- 'id': thumbnail_id,
- 'url': thumbnail['url'],
- } for thumbnail_id, thumbnail in (video.get('images') or {}).items() if thumbnail.get('url')]
-
- resp = self._call_api(
- f'playback_streams/{video_id}.json?drms=dt3&device_id={self._DEVICE_ID}',
- video_id, 'Downloading video streams JSON')['main'][0]
-
- stream_id = try_get(resp, lambda x: x['properties']['track']['stream_id'])
- subtitles = dict((lang, [{
- 'ext': ext,
- 'url': self._API_URL_TEMPLATE % self._api_query(
- f'videos/{video_id}/auth_subtitles/{lang}.{ext}', stream_id=stream_id),
- } for ext in ('srt', 'vtt')]) for lang in (video.get('subtitle_completions') or {}))
-
- mpd_url = resp['url']
- # 720p is hidden in another MPD which can be found in the current manifest content
- mpd_content = self._download_webpage(mpd_url, video_id, note='Downloading initial MPD manifest')
- mpd_url = self._search_regex(
- r'(?mi)(http.+.mpd)', mpd_content, 'new manifest', default=mpd_url)
- if 'mpdhd_high' not in mpd_url and 'sig=' not in mpd_url:
- # Modify the URL to get 1080p
- mpd_url = mpd_url.replace('mpdhd', 'mpdhd_high')
- formats = self._extract_mpd_formats(mpd_url, video_id)
-
- return {
- 'id': video_id,
- 'formats': formats,
- 'title': title,
- 'description': self.dict_selection(video.get('descriptions', {}), 'en'),
- 'duration': int_or_none(video.get('duration')),
- 'timestamp': parse_iso8601(video.get('created_at')),
- 'uploader': video.get('author'),
- 'uploader_url': video.get('author_url'),
- 'like_count': int_or_none(try_get(video, lambda x: x['likes']['count'])),
- 'age_limit': parse_age_limit(video.get('rating')),
- 'thumbnails': thumbnails,
- 'subtitles': subtitles,
- 'episode_number': episode_number,
- }
-
-
-class VikiChannelIE(VikiBaseIE):
- IE_NAME = 'viki:channel'
- _VALID_URL = rf'{VikiBaseIE._VALID_URL_BASE}(?:tv|news|movies|artists)/(?P[0-9]+c)'
- _TESTS = [{
- 'url': 'http://www.viki.com/tv/50c-boys-over-flowers',
- 'info_dict': {
- 'id': '50c',
- 'title': 'Boys Over Flowers',
- 'description': 'md5:804ce6e7837e1fd527ad2f25420f4d59',
- },
- 'playlist_mincount': 51,
- }, {
- 'url': 'http://www.viki.com/tv/1354c-poor-nastya-complete',
- 'info_dict': {
- 'id': '1354c',
- 'title': 'Poor Nastya [COMPLETE]',
- 'description': 'md5:05bf5471385aa8b21c18ad450e350525',
- },
- 'playlist_count': 127,
- 'skip': 'Page not found',
- }, {
- 'url': 'http://www.viki.com/news/24569c-showbiz-korea',
- 'only_matching': True,
- }, {
- 'url': 'http://www.viki.com/movies/22047c-pride-and-prejudice-2005',
- 'only_matching': True,
- }, {
- 'url': 'http://www.viki.com/artists/2141c-shinee',
- 'only_matching': True,
- }]
-
- _video_types = ('episodes', 'movies', 'clips', 'trailers')
-
- def _entries(self, channel_id):
- params = {
- 'app': self._APP, 'token': self._token, 'only_ids': 'true',
- 'direction': 'asc', 'sort': 'number', 'per_page': 30,
- }
- video_types = self._configuration_arg('video_types') or self._video_types
- for video_type in video_types:
- if video_type not in self._video_types:
- self.report_warning(f'Unknown video_type: {video_type}')
- page_num = 0
- while True:
- page_num += 1
- params['page'] = page_num
- res = self._call_api(
- f'containers/{channel_id}/{video_type}.json', channel_id, query=params, fatal=False,
- note=f'Downloading {video_type.title()} JSON page {page_num}')
-
- for video_id in res.get('response') or []:
- yield self.url_result(f'https://www.viki.com/videos/{video_id}', VikiIE.ie_key(), video_id)
- if not res.get('more'):
- break
-
- def _real_extract(self, url):
- channel_id = self._match_id(url)
- channel = self._call_api(f'containers/{channel_id}.json', channel_id, 'Downloading channel JSON')
- self._check_errors(channel)
- return self.playlist_result(
- self._entries(channel_id), channel_id,
- self.dict_selection(channel['titles'], 'en'),
- self.dict_selection(channel['descriptions'], 'en'))
diff --git a/yt_dlp/extractor/vrt.py b/yt_dlp/extractor/vrt.py
index 5def2bacf4..6e5514eefd 100644
--- a/yt_dlp/extractor/vrt.py
+++ b/yt_dlp/extractor/vrt.py
@@ -201,7 +201,35 @@ class VrtNUIE(VRTBaseIE):
'timestamp': 1740373200,
'title': 'Reeks 6 volledig vanaf 3 maart',
'upload_date': '20250224',
- '_old_archive_ids': ['canvas pbs-pub-c8a78645-5d3e-468a-89ec-6f3ed5534bd5$vid-242ddfe9-18f5-4e16-ab45-09b122a19251'],
+ '_old_archive_ids': [
+ 'canvas pbs-pub-c8a78645-5d3e-468a-89ec-6f3ed5534bd5$vid-242ddfe9-18f5-4e16-ab45-09b122a19251',
+ 'ketnet pbs-pub-c8a78645-5d3e-468a-89ec-6f3ed5534bd5$vid-242ddfe9-18f5-4e16-ab45-09b122a19251',
+ ],
+ },
+ }, {
+ 'url': 'https://www.vrt.be/vrtmax/a-z/meisjes/6/meisjes-s6a5/',
+ 'info_dict': {
+ 'id': 'pbs-pub-97b541ab-e05c-43b9-9a40-445702ef7189$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
+ 'ext': 'mp4',
+ 'channel': 'ketnet',
+ 'description': 'md5:713793f15cbf677f66200b36b7b1ec5a',
+ 'display_id': 'meisjes-s6a5',
+ 'duration': 1336.02,
+ 'episode': 'Week 5',
+ 'episode_id': '1684157692901',
+ 'episode_number': 5,
+ 'season': '6',
+ 'season_id': '1684157692901',
+ 'season_number': 6,
+ 'series': 'Meisjes',
+ 'thumbnail': 'https://images.vrt.be/orig/2023/05/14/bf526ae0-f1d9-11ed-91d7-02b7b76bf47f.jpg',
+ 'timestamp': 1685251800,
+ 'title': 'Week 5',
+ 'upload_date': '20230528',
+ '_old_archive_ids': [
+ 'canvas pbs-pub-97b541ab-e05c-43b9-9a40-445702ef7189$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
+ 'ketnet pbs-pub-97b541ab-e05c-43b9-9a40-445702ef7189$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
+ ],
},
}, {
'url': 'https://www.vrt.be/vrtnu/a-z/taboe/3/taboe-s3a4/',
@@ -223,7 +251,10 @@ class VrtNUIE(VRTBaseIE):
'timestamp': 1740286800,
'title': 'Mensen met het syndroom van Gilles de la Tourette',
'upload_date': '20250223',
- '_old_archive_ids': ['canvas pbs-pub-f50faa3a-1778-46b6-9117-4ba85f197703$vid-547507fe-1c8b-4394-b361-21e627cbd0fd'],
+ '_old_archive_ids': [
+ 'canvas pbs-pub-f50faa3a-1778-46b6-9117-4ba85f197703$vid-547507fe-1c8b-4394-b361-21e627cbd0fd',
+ 'ketnet pbs-pub-f50faa3a-1778-46b6-9117-4ba85f197703$vid-547507fe-1c8b-4394-b361-21e627cbd0fd',
+ ],
},
}]
_NETRC_MACHINE = 'vrtnu'
@@ -427,66 +458,8 @@ class VrtNUIE(VRTBaseIE):
'display_id': display_id,
'formats': formats,
'subtitles': subtitles,
- '_old_archive_ids': [make_archive_id('Canvas', video_id)],
- }
-
-
-class KetnetIE(VRTBaseIE):
- _VALID_URL = r'https?://(?:www\.)?ketnet\.be/(?P(?:[^/]+/)*[^/?#&]+)'
- _TESTS = [{
- 'url': 'https://www.ketnet.be/kijken/m/meisjes/6/meisjes-s6a5',
- 'info_dict': {
- 'id': 'pbs-pub-39f8351c-a0a0-43e6-8394-205d597d6162$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
- 'ext': 'mp4',
- 'title': 'Meisjes',
- 'episode': 'Reeks 6: Week 5',
- 'season': 'Reeks 6',
- 'series': 'Meisjes',
- 'timestamp': 1685251800,
- 'upload_date': '20230528',
- },
- 'params': {'skip_download': 'm3u8'},
- }]
-
- def _real_extract(self, url):
- display_id = self._match_id(url)
-
- video = self._download_json(
- 'https://senior-bff.ketnet.be/graphql', display_id, query={
- 'query': '''{
- video(id: "content/ketnet/nl/%s.model.json") {
- description
- episodeNr
- imageUrl
- mediaReference
- programTitle
- publicationDate
- seasonTitle
- subtitleVideodetail
- titleVideodetail
- }
-}''' % display_id, # noqa: UP031
- })['data']['video']
-
- video_id = urllib.parse.unquote(video['mediaReference'])
- data = self._call_api(video_id, 'ketnet@PROD', version='v1')
- formats, subtitles = self._extract_formats_and_subtitles(data, video_id)
-
- return {
- 'id': video_id,
- 'formats': formats,
- 'subtitles': subtitles,
- '_old_archive_ids': [make_archive_id('Canvas', video_id)],
- **traverse_obj(video, {
- 'title': ('titleVideodetail', {str}),
- 'description': ('description', {str}),
- 'thumbnail': ('thumbnail', {url_or_none}),
- 'timestamp': ('publicationDate', {parse_iso8601}),
- 'series': ('programTitle', {str}),
- 'season': ('seasonTitle', {str}),
- 'episode': ('subtitleVideodetail', {str}),
- 'episode_number': ('episodeNr', {int_or_none}),
- }),
+ '_old_archive_ids': [make_archive_id('Canvas', video_id),
+ make_archive_id('Ketnet', video_id)],
}
diff --git a/yt_dlp/extractor/weibo.py b/yt_dlp/extractor/weibo.py
index 6d4bd46e25..420ac38299 100644
--- a/yt_dlp/extractor/weibo.py
+++ b/yt_dlp/extractor/weibo.py
@@ -109,7 +109,7 @@ class WeiboBaseIE(InfoExtractor):
**traverse_obj(video_info, {
'display_id': ('mblogid', {str_or_none}),
'title': ('page_info', 'media_info', ('video_title', 'kol_title', 'name'),
- {lambda x: x.replace('\n', ' ')}, {truncate_string(left=50)}, filter),
+ {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}, filter),
'alt_title': ('page_info', 'media_info', ('video_title', 'kol_title', 'name'), {str}, filter),
'description': ('text_raw', {str}),
'duration': ('page_info', 'media_info', 'duration', {int_or_none}),
@@ -213,6 +213,7 @@ class WeiboVideoIE(WeiboBaseIE):
'ext': 'mp4',
'display_id': 'LEZDodaiW',
'title': '呃，稍微了解了一下靡烟miya，感觉这东西也太二了',
+ 'alt_title': '呃，稍微了解了一下靡烟miya，感觉这东西也太二了',
'description': '呃，稍微了解了一下靡烟miya，感觉这东西也太二了 http://t.cn/A6aerGsM \u200b\u200b\u200b',
'duration': 76,
'timestamp': 1659344278,
@@ -224,6 +225,7 @@ class WeiboVideoIE(WeiboBaseIE):
'view_count': int,
'like_count': int,
'repost_count': int,
+ '_old_archive_ids': ['weibomobile 4797700463137878'],
},
}]
diff --git a/yt_dlp/extractor/youtube/_video.py b/yt_dlp/extractor/youtube/_video.py
index 5c1485a43d..c773ba2f11 100644
--- a/yt_dlp/extractor/youtube/_video.py
+++ b/yt_dlp/extractor/youtube/_video.py
@@ -130,7 +130,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
_RETURN_TYPE = 'video' # XXX: How to handle multifeed?
_PLAYER_INFO_RE = (
- r'/s/player/(?P[a-zA-Z0-9_-]{8,})/player',
+ r'/s/player/(?P[a-zA-Z0-9_-]{8,})/(?:tv-)?player',
r'/(?P[a-zA-Z0-9_-]{8,})/player(?:_ias\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\.vflset)/base\.js$',
r'\b(?Pvfl[a-zA-Z0-9_-]+)\b.*?\.js$',
)
@@ -1939,11 +1939,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
get_all=False, expected_type=str)
if not player_url:
return
- # TODO: Add proper support for the 'tce' variant players
- # See https://github.com/yt-dlp/yt-dlp/issues/12398
- if '/player_ias_tce.vflset/' in player_url:
- self.write_debug(f'Modifying tce player URL: {player_url}')
- player_url = player_url.replace('/player_ias_tce.vflset/', '/player_ias.vflset/')
return urljoin('https://www.youtube.com', player_url)
def _download_player_url(self, video_id, fatal=False):
@@ -2069,7 +2064,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
jscode, 'Initial JS player signature function name', group='sig')
jsi = JSInterpreter(jscode)
- initial_function = jsi.extract_function(funcname)
+ global_var_map = {}
+ _, varname, value = self._extract_player_js_global_var(jscode)
+ if varname:
+ global_var_map[varname] = jsi.interpret_expression(value, {}, allow_recursion=100)
+ initial_function = jsi.extract_function(funcname, global_var_map)
return lambda s: initial_function([s])
def _cached(self, func, *cache_id):
@@ -2173,14 +2172,31 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
rf'var {re.escape(funcname)}\s*=\s*(\[.+?\])\s*[,;]', jscode,
f'Initial JS player n function list ({funcname}.{idx})')))[int(idx)]
- def _fixup_n_function_code(self, argnames, code):
+ def _extract_player_js_global_var(self, jscode):
+ """Returns tuple of strings: variable assignment code, variable name, variable value code"""
+ return self._search_regex(
+ r'''(?x)
+ \'use\s+strict\';\s*
+ (?P
+ var\s+(?P[a-zA-Z0-9_$]+)\s*=\s*
+ (?P"(?:[^"\\]|\\.)+"\.split\("[^"]+"\))
+ )[;,]
+ ''', jscode, 'global variable', group=('code', 'name', 'value'), default=(None, None, None))
+
+ def _fixup_n_function_code(self, argnames, code, full_code):
+ global_var, varname, _ = self._extract_player_js_global_var(full_code)
+ if global_var:
+ self.write_debug(f'Prepending n function code with global array variable "{varname}"')
+ code = global_var + ', ' + code
+ else:
+ self.write_debug('No global array variable found in player JS')
return argnames, re.sub(
- rf';\s*if\s*\(\s*typeof\s+[a-zA-Z0-9_$]+\s*===?\s*(["\'])undefined\1\s*\)\s*return\s+{argnames[0]};',
+ rf';\s*if\s*\(\s*typeof\s+[a-zA-Z0-9_$]+\s*===?\s*(?:(["\'])undefined\1|{varname}\[\d+\])\s*\)\s*return\s+{argnames[0]};',
';', code)
def _extract_n_function_code(self, video_id, player_url):
player_id = self._extract_player_info(player_url)
- func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.02.19')
+ func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.03.21')
jscode = func_code or self._load_player(video_id, player_url)
jsi = JSInterpreter(jscode)
@@ -2189,8 +2205,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
func_name = self._extract_n_function_name(jscode, player_url=player_url)
- # XXX: Workaround for the `typeof` gotcha
- func_code = self._fixup_n_function_code(*jsi.extract_function_code(func_name))
+ # XXX: Workaround for the global array variable and lack of `typeof` implementation
+ func_code = self._fixup_n_function_code(*jsi.extract_function_code(func_name), jscode)
self.cache.store('youtube-nsig', player_id, func_code)
return jsi, player_id, func_code
@@ -3141,14 +3157,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'n': decrypt_nsig(query['n'][0], video_id, player_url),
})
except ExtractorError as e:
- phantomjs_hint = ''
- if isinstance(e, JSInterpreter.Exception):
- phantomjs_hint = (f' Install {self._downloader._format_err("PhantomJS", self._downloader.Styles.EMPHASIS)} '
- f'to workaround the issue. {PhantomJSwrapper.INSTALL_HINT}\n')
if player_url:
self.report_warning(
- f'nsig extraction failed: Some formats may be missing\n{phantomjs_hint}'
- f' n = {query["n"][0]} ; player = {player_url}', video_id=video_id, only_once=True)
+ f'nsig extraction failed: Some formats may be missing\n'
+ f' n = {query["n"][0]} ; player = {player_url}',
+ video_id=video_id, only_once=True)
self.write_debug(e, only_once=True)
else:
self.report_warning(
diff --git a/yt_dlp/jsinterp.py b/yt_dlp/jsinterp.py
index ac06297154..d46b78f64f 100644
--- a/yt_dlp/jsinterp.py
+++ b/yt_dlp/jsinterp.py
@@ -301,7 +301,7 @@ class JSInterpreter:
OP_CHARS = '+-*/%&|^=<>!,;{}:['
if not expr:
return
- counters = {k: 0 for k in _MATCHING_PARENS.values()}
+ counters = dict.fromkeys(_MATCHING_PARENS.values(), 0)
start, splits, pos, delim_len = 0, 0, 0, len(delim) - 1
in_quote, escaping, after_op, in_regex_char_group = None, False, True, False
for idx, char in enumerate(expr):
@@ -890,9 +890,9 @@ class JSInterpreter:
code, _ = self._separate_at_paren(func_m.group('code'))
return [x.strip() for x in func_m.group('args').split(',')], code
- def extract_function(self, funcname):
+ def extract_function(self, funcname, *global_stack):
return function_with_repr(
- self.extract_function_from_code(*self.extract_function_code(funcname)),
+ self.extract_function_from_code(*self.extract_function_code(funcname), *global_stack),
f'F<{funcname}>')
def extract_function_from_code(self, argnames, code, *global_stack):
diff --git a/yt_dlp/networking/_curlcffi.py b/yt_dlp/networking/_curlcffi.py
index 0643348e7e..c800f2c095 100644
--- a/yt_dlp/networking/_curlcffi.py
+++ b/yt_dlp/networking/_curlcffi.py
@@ -1,6 +1,7 @@
from __future__ import annotations
import io
+import itertools
import math
import re
import urllib.parse
@@ -31,9 +32,9 @@ if curl_cffi is None:
curl_cffi_version = tuple(map(int, re.split(r'[^\d]+', curl_cffi.__version__)[:3]))
-if curl_cffi_version != (0, 5, 10) and not ((0, 7, 0) <= curl_cffi_version < (0, 7, 2)):
+if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version:
curl_cffi._yt_dlp__version = f'{curl_cffi.__version__} (unsupported)'
- raise ImportError('Only curl_cffi versions 0.5.10, 0.7.0 and 0.7.1 are supported')
+ raise ImportError('Only curl_cffi versions 0.5.10 and 0.10.x are supported')
import curl_cffi.requests
from curl_cffi.const import CurlECode, CurlOpt
@@ -97,7 +98,7 @@ class CurlCFFIResponseAdapter(Response):
return self.fp.read(amt)
except curl_cffi.requests.errors.RequestsError as e:
if e.code == CurlECode.PARTIAL_FILE:
- content_length = int_or_none(e.response.headers.get('Content-Length'))
+ content_length = e.response and int_or_none(e.response.headers.get('Content-Length'))
raise IncompleteRead(
partial=self.fp.bytes_read,
expected=content_length - self.fp.bytes_read if content_length is not None else None,
@@ -105,6 +106,51 @@ class CurlCFFIResponseAdapter(Response):
raise TransportError(cause=e) from e
+# See: https://github.com/lexiforest/curl_cffi?tab=readme-ov-file#supported-impersonate-browsers
+# https://github.com/lexiforest/curl-impersonate?tab=readme-ov-file#supported-browsers
+BROWSER_TARGETS: dict[tuple[int, ...], dict[str, ImpersonateTarget]] = {
+ (0, 5): {
+ 'chrome99': ImpersonateTarget('chrome', '99', 'windows', '10'),
+ 'chrome99_android': ImpersonateTarget('chrome', '99', 'android', '12'),
+ 'chrome100': ImpersonateTarget('chrome', '100', 'windows', '10'),
+ 'chrome101': ImpersonateTarget('chrome', '101', 'windows', '10'),
+ 'chrome104': ImpersonateTarget('chrome', '104', 'windows', '10'),
+ 'chrome107': ImpersonateTarget('chrome', '107', 'windows', '10'),
+ 'chrome110': ImpersonateTarget('chrome', '110', 'windows', '10'),
+ 'edge99': ImpersonateTarget('edge', '99', 'windows', '10'),
+ 'edge101': ImpersonateTarget('edge', '101', 'windows', '10'),
+ 'safari15_3': ImpersonateTarget('safari', '15.3', 'macos', '11'),
+ 'safari15_5': ImpersonateTarget('safari', '15.5', 'macos', '12'),
+ },
+ (0, 7): {
+ 'chrome116': ImpersonateTarget('chrome', '116', 'windows', '10'),
+ 'chrome119': ImpersonateTarget('chrome', '119', 'macos', '14'),
+ 'chrome120': ImpersonateTarget('chrome', '120', 'macos', '14'),
+ 'chrome123': ImpersonateTarget('chrome', '123', 'macos', '14'),
+ 'chrome124': ImpersonateTarget('chrome', '124', 'macos', '14'),
+ 'safari17_0': ImpersonateTarget('safari', '17.0', 'macos', '14'),
+ 'safari17_2_ios': ImpersonateTarget('safari', '17.2', 'ios', '17.2'),
+ },
+ (0, 9): {
+ 'safari15_3': ImpersonateTarget('safari', '15.3', 'macos', '14'),
+ 'safari15_5': ImpersonateTarget('safari', '15.5', 'macos', '14'),
+ 'chrome119': ImpersonateTarget('chrome', '119', 'macos', '14'),
+ 'chrome120': ImpersonateTarget('chrome', '120', 'macos', '14'),
+ 'chrome123': ImpersonateTarget('chrome', '123', 'macos', '14'),
+ 'chrome124': ImpersonateTarget('chrome', '124', 'macos', '14'),
+ 'chrome131': ImpersonateTarget('chrome', '131', 'macos', '14'),
+ 'chrome131_android': ImpersonateTarget('chrome', '131', 'android', '14'),
+ 'chrome133a': ImpersonateTarget('chrome', '133', 'macos', '15'),
+ 'firefox133': ImpersonateTarget('firefox', '133', 'macos', '14'),
+ 'safari18_0': ImpersonateTarget('safari', '18.0', 'macos', '15'),
+ 'safari18_0_ios': ImpersonateTarget('safari', '18.0', 'ios', '18.0'),
+ },
+ (0, 10): {
+ 'firefox135': ImpersonateTarget('firefox', '135', 'macos', '14'),
+ },
+}
+
+
@register_rh
class CurlCFFIRH(ImpersonateRequestHandler, InstanceStoreMixin):
RH_NAME = 'curl_cffi'
@@ -112,30 +158,21 @@ class CurlCFFIRH(ImpersonateRequestHandler, InstanceStoreMixin):
_SUPPORTED_FEATURES = (Features.NO_PROXY, Features.ALL_PROXY)
_SUPPORTED_PROXY_SCHEMES = ('http', 'https', 'socks4', 'socks4a', 'socks5', 'socks5h')
_SUPPORTED_IMPERSONATE_TARGET_MAP = {
- **({
- ImpersonateTarget('chrome', '124', 'macos', '14'): curl_cffi.requests.BrowserType.chrome124,
- ImpersonateTarget('chrome', '123', 'macos', '14'): curl_cffi.requests.BrowserType.chrome123,
- ImpersonateTarget('chrome', '120', 'macos', '14'): curl_cffi.requests.BrowserType.chrome120,
- ImpersonateTarget('chrome', '119', 'macos', '14'): curl_cffi.requests.BrowserType.chrome119,
- ImpersonateTarget('chrome', '116', 'windows', '10'): curl_cffi.requests.BrowserType.chrome116,
- } if curl_cffi_version >= (0, 7, 0) else {}),
- ImpersonateTarget('chrome', '110', 'windows', '10'): curl_cffi.requests.BrowserType.chrome110,
- ImpersonateTarget('chrome', '107', 'windows', '10'): curl_cffi.requests.BrowserType.chrome107,
- ImpersonateTarget('chrome', '104', 'windows', '10'): curl_cffi.requests.BrowserType.chrome104,
- ImpersonateTarget('chrome', '101', 'windows', '10'): curl_cffi.requests.BrowserType.chrome101,
- ImpersonateTarget('chrome', '100', 'windows', '10'): curl_cffi.requests.BrowserType.chrome100,
- ImpersonateTarget('chrome', '99', 'windows', '10'): curl_cffi.requests.BrowserType.chrome99,
- ImpersonateTarget('edge', '101', 'windows', '10'): curl_cffi.requests.BrowserType.edge101,
- ImpersonateTarget('edge', '99', 'windows', '10'): curl_cffi.requests.BrowserType.edge99,
- **({
- ImpersonateTarget('safari', '17.0', 'macos', '14'): curl_cffi.requests.BrowserType.safari17_0,
- } if curl_cffi_version >= (0, 7, 0) else {}),
- ImpersonateTarget('safari', '15.5', 'macos', '12'): curl_cffi.requests.BrowserType.safari15_5,
- ImpersonateTarget('safari', '15.3', 'macos', '11'): curl_cffi.requests.BrowserType.safari15_3,
- ImpersonateTarget('chrome', '99', 'android', '12'): curl_cffi.requests.BrowserType.chrome99_android,
- **({
- ImpersonateTarget('safari', '17.2', 'ios', '17.2'): curl_cffi.requests.BrowserType.safari17_2_ios,
- } if curl_cffi_version >= (0, 7, 0) else {}),
+ target: name if curl_cffi_version >= (0, 9) else curl_cffi.requests.BrowserType[name]
+ for name, target in dict(sorted(itertools.chain.from_iterable(
+ targets.items()
+ for version, targets in BROWSER_TARGETS.items()
+ if curl_cffi_version >= version
+ ), key=lambda x: (
+ # deprioritize mobile targets since they give very different behavior
+ x[1].os not in ('ios', 'android'),
+ # prioritize edge < firefox < safari < chrome
+ ('edge', 'firefox', 'safari', 'chrome').index(x[1].client),
+ # prioritize newest version
+ float(x[1].version) if x[1].version else 0,
+ # group by os name
+ x[1].os,
+ ), reverse=True)).items()
}
def _create_instance(self, cookiejar=None):
diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py
index e59e9832bd..59a49aa578 100644
--- a/yt_dlp/postprocessor/ffmpeg.py
+++ b/yt_dlp/postprocessor/ffmpeg.py
@@ -743,7 +743,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
if value not in ('', None):
value = ', '.join(map(str, variadic(value)))
value = value.replace('\0', '') # nul character cannot be passed in command line
- metadata['common'].update({meta_f: value for meta_f in variadic(meta_list)})
+ metadata['common'].update(dict.fromkeys(variadic(meta_list), value))
# Info on media metadata/metadata supported by ffmpeg:
# https://wiki.multimedia.cx/index.php/FFmpeg_Metadata
diff --git a/yt_dlp/update.py b/yt_dlp/update.py
index 360f5ad58c..8e887ec031 100644
--- a/yt_dlp/update.py
+++ b/yt_dlp/update.py
@@ -117,7 +117,7 @@ _FILE_SUFFIXES = {
}
_NON_UPDATEABLE_REASONS = {
- **{variant: None for variant in _FILE_SUFFIXES}, # Updatable
+ **dict.fromkeys(_FILE_SUFFIXES), # Updatable
**{variant: f'Auto-update is not supported for unpackaged {name} executable; Re-download the latest release'
for variant, name in {'win32_dir': 'Windows', 'darwin_dir': 'MacOS', 'linux_dir': 'Linux'}.items()},
'py2exe': 'py2exe is no longer supported by yt-dlp; This executable cannot be updated',
diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py
index 4093c238c2..0140acaa3a 100644
--- a/yt_dlp/utils/_utils.py
+++ b/yt_dlp/utils/_utils.py
@@ -3247,7 +3247,7 @@ def _match_one(filter_part, dct, incomplete):
op = lambda attr, value: not unnegated_op(attr, value)
else:
op = unnegated_op
- comparison_value = m['quotedstrval'] or m['strval'] or m['intval']
+ comparison_value = m['quotedstrval'] or m['strval']
if m['quote']:
comparison_value = comparison_value.replace(r'\{}'.format(m['quote']), m['quote'])
actual_value = dct.get(m['key'])
diff --git a/yt_dlp/version.py b/yt_dlp/version.py
index 7346ca49c9..c12cfc079f 100644
--- a/yt_dlp/version.py
+++ b/yt_dlp/version.py
@@ -1,8 +1,8 @@
# Autogenerated by devscripts/update-version.py
-__version__ = '2025.02.19'
+__version__ = '2025.03.21'
-RELEASE_GIT_HEAD = '4985a4041770eaa0016271809a1fd950dc809a55'
+RELEASE_GIT_HEAD = 'f36e4b6e65cb8403791aae2f520697115cb88dec'
VARIANT = None
@@ -12,4 +12,4 @@ CHANNEL = 'stable'
ORIGIN = 'yt-dlp/yt-dlp'
-_pkg_version = '2025.02.19'
+_pkg_version = '2025.03.21'