Skip to content

Commit da7223d

Browse files
dirkfseproDev
andcommitted
[YouTube] Improve support for tce-style player JS
* improve extraction of global "useful data" Array from player JS * also handle tv-player and add tests: thx seproDev (yt-dlp/yt-dlp#12684) Co-Authored-By: sepro <[email protected]>
1 parent 37c2440 commit da7223d

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

test/test_youtube_signature.py

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,32 @@
232232
'W9HJZKktxuYoDTqW', 'jHbbkcaxm54',
233233
),
234234
(
235-
'https://www.youtube.com/s/player/91201489/player_ias_tce.vflset/en_US/base.js',
236-
'W9HJZKktxuYoDTqW', 'U48vOZHaeYS6vO',
235+
'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
236+
'W9HJZKktxuYoDTqW', 'larxUlagTRAcSw',
237+
),
238+
(
239+
'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
240+
'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
241+
),
242+
(
243+
'https://www.youtube.com/s/player/d50f54ef/player_ias_tce.vflset/en_US/base.js',
244+
'Ha7507LzRmH3Utygtj', 'XFTb2HoeOE5MHg',
245+
),
246+
(
247+
'https://www.youtube.com/s/player/074a8365/player_ias_tce.vflset/en_US/base.js',
248+
'Ha7507LzRmH3Utygtj', 'ufTsrE0IVYrkl8v',
249+
),
250+
(
251+
'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
252+
'N5uAlLqm0eg1GyHO', 'dCBQOejdq5s-ww',
253+
),
254+
(
255+
'https://www.youtube.com/s/player/69f581a5/tv-player-ias.vflset/tv-player-ias.js',
256+
'-qIP447rVlTTwaZjY', 'KNcGOksBAvwqQg',
257+
),
258+
(
259+
'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
260+
'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
237261
),
238262
]
239263

youtube_dl/extractor/youtube.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
692692
'invidious': '|'.join(_INVIDIOUS_SITES),
693693
}
694694
_PLAYER_INFO_RE = (
695-
r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/player',
695+
r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})//(?:tv-)?player',
696696
r'/(?P<id>[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$',
697697
r'\b(?P<id>vfl[a-zA-Z0-9_-]+)\b.*?\.js$',
698698
)
@@ -1857,7 +1857,7 @@ def _extract_n_function_code(self, video_id, player_url):
18571857
def _extract_n_function_code_jsi(self, video_id, jsi, player_id=None):
18581858

18591859
var_ay = self._search_regex(
1860-
r'(?:[;\s]|^)\s*(var\s*[\w$]+\s*=\s*"[^"]+"\s*\.\s*split\("\{"\))(?=\s*[,;])',
1860+
r'(?:[;\s]|^)\s*(var\s*[\w$]+\s*=\s*"(?:\\"|[^"])+"\s*\.\s*split\("\W+"\))(?=\s*[,;])',
18611861
jsi.code, 'useful values', default='')
18621862

18631863
func_name = self._extract_n_function_name(jsi.code)

0 commit comments

Comments
 (0)