Compare commits

...

23 Commits

Author SHA1 Message Date
ckaotik
e8c03eafcf
Merge 47f1d701497105778f4f9213429612e88a3a23e3 into 2b4fbfce25902d557b86b003cf48f738129efce4 2025-03-26 08:12:18 +00:00
dirkf
2b4fbfce25 [YouTube] Support player 4fcd6e4a
thx seproDev, bashonly: yt-dlp/yt-dlp#12748
2025-03-26 02:27:25 +00:00
dirkf
1bc45b8b6c [JSInterp] Use , for join() with null/undefined argument
Eg: [1,2,3].join(null) -> '1,2,3'
2025-03-25 22:35:06 +00:00
dirkf
b982d77d0b [YouTube] Align signature tests with yt-dlp
thx bashonly, yt-dlp/yt-dlp#12725
2025-03-25 22:35:06 +00:00
dirkf
c55dbf4838 [YouTube] Update signature extraction for players 643afba4, 363db69b 2025-03-25 22:35:06 +00:00
dirkf
087d865230 [YouTube] Support new player URL patterns 2025-03-25 22:35:06 +00:00
dirkf
a4fc1151f1 [JSInterp] Improve indexing
* catch invalid list index with `ValueError` (eg [1, 2]['ab'] -> undefined)
* allow assignment outside existing list (eg var l = [1,2]; l[9] = 0;)
2025-03-25 22:35:05 +00:00
dirkf
a464c159e6 [YouTube] Make _extract_player_info() use _search_regex() 2025-03-25 22:35:05 +00:00
dirkf
7dca08eff0 [YouTube] Also get original of translated automatic captions 2025-03-25 22:35:05 +00:00
dirkf
2239ee7965 [YouTube] Get subtitles/automatic captions from both web and API responses 2025-03-25 22:35:05 +00:00
ckaotik
47f1d70149 Merge branch 'master' into mediathekviewweb 2021-05-09 13:50:20 +02:00
ckaotik
bbfd415058 Specify subtitle file extension 2021-03-13 11:27:11 +01:00
ckaotik
338e4b8527 Import __future__.unicode_literals 2021-02-21 14:31:04 +01:00
ckaotik
e585d7bcf5 Specify utf-8 encoding 2021-02-21 14:26:31 +01:00
ckaotik
c8d69b4d33 [mediathekviewweb] Stray whitespace 2021-02-21 13:08:32 +01:00
ckaotik
230fb7caa1 [mediathekviewweb] Added tests 2021-02-21 13:03:35 +01:00
ckaotik
57f070e5ac [mediathekviewweb] Added pretty playlist name if topic is common for all results 2021-02-21 13:03:35 +01:00
ckaotik
3e3b11c80b [mediathekviewweb] Fixed future and everywhere detection 2021-02-21 13:03:35 +01:00
ckaotik
14384d4a6f [mediathekviewweb] Tweaked detection & naming for sign language/audio description 2021-02-21 13:03:35 +01:00
ckaotik
8a6fd68b92 [mediathekviewweb] Support future/everywhere filters. 2021-02-21 13:03:35 +01:00
ckaotik
a482e8fba0 [mediathekviewweb] flake8 2021-02-21 13:03:35 +01:00
ckaotik
4c91c4f146 [mediathekviewweb] Register extractor 2021-02-21 13:03:35 +01:00
ckaotik
e17d20829b [mediathekviewweb] Add new extractor 2021-02-21 13:03:35 +01:00
5 changed files with 388 additions and 48 deletions

View File

@ -84,6 +84,21 @@ _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',
),
(
'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
'2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
'0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
),
(
'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
'2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
),
]
_NSIG_TESTS = [
@ -153,7 +168,7 @@ _NSIG_TESTS = [
),
(
'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
'-Txvy6bT5R6LqgnQNx', 'dcklJCnRUHbgSg',
'M92UUMHa8PdvPd3wyM', '3hPqLJsiNZx7yA',
),
(
'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
@ -173,7 +188,7 @@ _NSIG_TESTS = [
),
(
'https://www.youtube.com/s/player/cfa9e7cb/player_ias.vflset/en_US/base.js',
'qO0NiMtYQ7TeJnfFG2', 'k9cuJDHNS5O7kQ',
'aCi3iElgd2kq0bxVbQ', 'QX1y8jGb2IbZ0w',
),
(
'https://www.youtube.com/s/player/8c7583ff/player_ias.vflset/en_US/base.js',
@ -231,10 +246,6 @@ _NSIG_TESTS = [
'https://www.youtube.com/s/player/f6e09c70/player_ias_tce.vflset/en_US/base.js',
'W9HJZKktxuYoDTqW', 'jHbbkcaxm54',
),
(
'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
'W9HJZKktxuYoDTqW', 'larxUlagTRAcSw',
),
(
'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
@ -259,6 +270,22 @@ _NSIG_TESTS = [
'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
),
(
'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
'W9HJZKktxuYoDTqW', 'larxUlagTRAcSw',
),
(
'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
'eWYu5d5YeY_4LyEDc', 'XJQqf-N7Xra3gg',
),
(
'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
),
(
'https://www.youtube.com/s/player/4fcd6e4a/tv-player-ias.vflset/tv-player-ias.js',
'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
),
]
@ -271,6 +298,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'),
@ -280,8 +309,9 @@ class TestPlayerInfo(unittest.TestCase):
('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js', 'vflXGBaUN'),
('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js', 'vflKjOTVq'),
)
ie = YoutubeIE(FakeYDL({'cachedir': False}))
for player_url, expected_player_id in PLAYER_URLS:
player_id = YoutubeIE._extract_player_info(player_url)
player_id = ie._extract_player_info(player_url)
self.assertEqual(player_id, expected_player_id)
@ -301,8 +331,8 @@ class TestSignature(unittest.TestCase):
def t_factory(name, sig_func, url_pattern):
def make_tfunc(url, sig_input, expected_sig):
m = url_pattern.match(url)
assert m, '%r should follow URL format' % url
test_id = m.group('id')
assert m, '{0!r} should follow URL format'.format(url)
test_id = re.sub(r'[/.-]', '_', m.group('id') or m.group('compat_id'))
def test_func(self):
basename = 'player-{0}-{1}.js'.format(name, test_id)
@ -335,12 +365,16 @@ def n_sig(jscode, sig_input):
make_sig_test = t_factory(
'signature', signature, re.compile(r'.*(?:-|/player/)(?P<id>[a-zA-Z0-9_-]+)(?:/.+\.js|(?:/watch_as3|/html5player)?\.[a-z]+)$'))
'signature', signature,
re.compile(r'''(?x)
.+/(?P<h5>html5)?player(?(h5)(?:-en_US)?-|/)(?P<id>[a-zA-Z0-9/._-]+)
(?(h5)/(?: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<id>[a-zA-Z0-9_-]+)/.+.js$'))
'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_/.-]+)\.js$'))
for test_spec in _NSIG_TESTS:
make_nsig_test(*test_spec)

View File

@ -678,6 +678,10 @@ from .mediasite import (
MediasiteCatalogIE,
MediasiteNamedCatalogIE,
)
from .mediathekviewweb import (
MediathekViewWebSearchIE,
MediathekViewWebIE,
)
from .medici import MediciIE
from .megaphone import MegaphoneIE
from .meipai import MeipaiIE

View File

@ -0,0 +1,280 @@
# coding=utf-8
from __future__ import unicode_literals
import datetime
import itertools
import json
from .common import InfoExtractor, SearchInfoExtractor
from ..compat import compat_parse_qs, compat_urlparse
from ..utils import ExtractorError, int_or_none
class MediathekViewWebSearchIE(SearchInfoExtractor):
IE_NAME = 'mediathekviewweb:search'
IE_DESC = 'MediathekViewWeb search'
_SEARCH_KEY = 'mvwsearch'
_MAX_RESULTS = float('inf')
_MAX_RESULTS_PER_PAGE = 50
_TESTS = [
{
'url': 'mvwsearchall:sandmännchen !kika',
'info_dict': {
'title': 'Unser Sandmännchen',
},
'playlist': [],
'playlist_count': 7,
},
{
# Audio description & common topic.
'url': 'mvwsearch:#Sendung,Maus Audiodeskription',
'info_dict': {
'title': 'Die Sendung mit der Maus',
},
'playlist': [],
'playlist_count': 1,
'params': {
'format': 'medium-audio_description',
'skip_download': True,
}
},
{
# Sign language.
'url': 'mvwsearchall:!ard #Tagesschau Gebärdensprache',
'info_dict': {
'title': '!ard #Tagesschau Gebärdensprache',
},
'playlist': [],
'playlist_mincount': 365,
'params': {
'format': 'medium-sign_language',
'skip_download': True,
},
},
]
# Map of title affixes indicating video variants.
_variants = {
'audio_description': 'Audiodeskription',
'sign_language': 'mit Gebärdensprache',
}
_future = True
_everywhere = False
def _build_conditions(self, search):
# @note So far, there is no API endpoint to convert a query string into
# a complete query object, as required by the /api/query endpoint.
filters = {}
extra = {}
for component in search.lower().split():
if len(component) == 0:
continue
operator = component[0:1]
value = component[1:]
if len(value) == 0:
# Treat single character query as such.
# @note This differs from MVW's implementation.
operator = ''
value = component
# Extra, non-field settings.
if operator == '>':
value = int(value.split(',')[0]) * 60
extra['duration_min'] = max(extra.get('duration_min', 0), value)
continue
elif operator == '<':
value = int(value.split(',')[0]) * 60
extra['duration_max'] = min(extra.get('duration_max', float('inf')), value)
continue
# Field query operators.
if operator == '!':
field = 'channel'
elif operator == '#':
field = 'topic'
elif operator == '+':
field = 'title'
elif operator == '*':
field = 'description'
else:
# No known operator specified.
field = 'generic'
value = component
# @note In theory, comma-joined values are for AND queries. However
# so far, each condition is AND joined, even without comma.
filters.setdefault(field, []).append(' '.join(value.split(',')))
# Generic filters can apply to different fields, based on the query.
if 'generic' in filters:
if self._everywhere:
filters['channel,topic,title,description'] = filters['generic']
elif 'topic' in filters:
filters['title'] = filters['generic']
else:
filters['topic,title'] = filters['generic']
filters.pop('generic')
conditions = []
for field, keys in filters.items():
for query in keys:
conditions.append({
'fields': field.split(','),
'query': query,
})
return conditions, extra
def _extract_playlist_entries(self, results):
entries = []
for item in results:
variant = None
for key, value in self._variants.items():
if item.setdefault('title', '').find(value) != -1:
variant = key
formats = []
formats.append({
'url': item['url_video'],
'format': ('medium (' + self._variants[variant] + ')') if variant else None,
'format_id': ('medium-' + variant) if variant else 'medium',
'language_preference': -10 if variant else 10,
'quality': -2,
'filesize': item.get('size'),
})
if len(item.get('url_video_low', '')) > 0:
formats.append({
'url': item['url_video_low'],
'format': ('low (' + self._variants[variant] + ')') if variant else None,
'format_id': ('low-' + variant) if variant else 'low',
'language_preference': -10 if variant else 10,
'quality': -3,
})
if len(item.get('url_video_hd', '')) > 0:
formats.append({
'url': item['url_video_hd'],
'format': ('high (' + self._variants[variant] + ')') if variant else None,
'format_id': ('high-' + variant) if variant else 'high',
'language_preference': -10 if variant else 10,
'quality': -1,
})
self._sort_formats(formats)
video = {
'_type': 'video',
'formats': formats,
'id': item.get('id'),
'title': item.get('title'),
'description': item.get('description'),
'series': item.get('topic'),
'channel': item.get('channel'),
'uploader': item.get('channel'),
'duration': int_or_none(item.get('duration')),
'webpage_url': item.get('url_website'),
}
if item.get('timestamp'):
upload_date = datetime.datetime.utcfromtimestamp(item['timestamp'])
video['upload_date'] = upload_date.strftime('%Y%m%d')
if item.get('url_subtitle'):
video.setdefault('subtitles', {}).setdefault('de', []).append({
'url': item.get('url_subtitle'),
'ext': 'ttml',
})
entries.append(video)
return entries
def _get_n_results(self, query, n):
queries, extra = self._build_conditions(query)
queryObject = {
'queries': queries,
'sortBy': 'timestamp',
'sortOrder': 'desc',
'future': self._future,
'duration_min': extra.get('duration_min'),
'duration_max': extra.get('duration_max'),
'offset': 0,
'size': min(n, self._MAX_RESULTS_PER_PAGE),
}
entries = []
for page_num in itertools.count(1):
queryObject.update({'offset': (page_num - 1) * queryObject['size']})
results = self._download_json('https://mediathekviewweb.de/api/query', query,
note='Fetching page %d' % page_num,
data=json.dumps(queryObject).encode('utf-8'),
headers={'Content-Type': 'text/plain'})
if results['err'] is not None:
raise ExtractorError('API returned an error: %s' % results['err'][0])
entries.extend(self._extract_playlist_entries(results['result']['results']))
meta = results['result']['queryInfo']
if len(entries) >= n:
entries = entries[:n]
break
elif meta['resultCount'] == 0:
break
common_topic = None
if entries:
common_topic = entries[0]['series']
for entry in entries:
common_topic = common_topic if entry['series'] == common_topic else None
return self.playlist_result(entries, playlist_title=common_topic or query)
class MediathekViewWebIE(InfoExtractor):
# @see https://github.com/mediathekview/mediathekviewweb
IE_NAME = 'mediathekviewweb'
_VALID_URL = r'https?://mediathekviewweb\.de/\#query=(?P<id>.+)'
_TESTS = [
{
# Test for everywhere.
'url': 'https://mediathekviewweb.de/#query=!ard%20%23Tagesschau%2020%2CUhr&everywhere=true',
'info_dict': {
'title': '!ard #Tagesschau 20,Uhr',
},
# Without everywhere, there are <100 results.
'playlist_mincount': 365,
'params': {
'skip_download': True,
},
},
{
# Test for non-future videos.
'url': 'https://mediathekviewweb.de/#query=%23sport%2Cim%2Costen%20biathlon&future=false',
'info_dict': {
'title': 'Sport im Osten',
},
# Future yields 4 results instead.
'playlist_maxcount': 2,
'params': {
'skip_download': True,
},
},
]
def _real_extract(self, url):
query_hash = self._match_id(url)
url_stub = '?query=' + query_hash
query = compat_parse_qs(compat_urlparse.urlparse(url_stub).query)
search = query['query'][0]
query.pop('query')
if len(query) > 0:
# Detect global flags, MVW is very strict about accepted values.
extractor = MediathekViewWebSearchIE(self._downloader)
if query.get('everywhere', []) == ['true']:
extractor._everywhere = True
if query.get('future', []) == ['false']:
extractor._future = False
return extractor._real_extract('mvwsearchall:' + search)
return self.url_result('mvwsearchall:' + search, ie=MediathekViewWebSearchIE.ie_key())

View File

@ -692,9 +692,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'invidious': '|'.join(_INVIDIOUS_SITES),
}
_PLAYER_INFO_RE = (
r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})//(?:tv-)?player',
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$',
r'\b(?P<id>vfl[a-zA-Z0-9_-]+)\b.*?\.js$',
r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/(?:tv-)?player',
r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias(?:_tce)?\.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(?P<id>vfl[a-zA-Z0-9_-]{6,})\b.*?\.js$',
)
_SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')
@ -1626,15 +1626,13 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
""" Return a string representation of a signature """
return '.'.join(compat_str(len(part)) for part in example_sig.split('.'))
@classmethod
def _extract_player_info(cls, player_url):
for player_re in cls._PLAYER_INFO_RE:
id_m = re.search(player_re, player_url)
if id_m:
break
else:
raise ExtractorError('Cannot identify player %r' % player_url)
return id_m.group('id')
def _extract_player_info(self, player_url):
try:
return self._search_regex(
self._PLAYER_INFO_RE, player_url, 'player info', group='id')
except ExtractorError as e:
raise ExtractorError(
'Cannot identify player %r' % (player_url,), cause=e)
def _load_player(self, video_id, player_url, fatal=True, player_id=None):
if not player_id:
@ -1711,6 +1709,23 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
' return %s\n') % (signature_id_tuple, expr_code)
self.to_screen('Extracted signature function:\n' + code)
def _extract_sig_fn(self, jsi, funcname):
var_ay = self._search_regex(
r'''(?x)
(?:\*/|\{|\n|^)\s*(?:'[^']+'\s*;\s*)
(var\s*[\w$]+\s*=\s*(?:
('|")(?:\\\2|(?!\2).)+\2\s*\.\s*split\(\s*('|")\W+\3\s*\)|
\[\s*(?:('|")(?:\\\4|(?!\4).)*\4\s*(?:(?=\])|,\s*))+\]
))(?=\s*[,;])
''', jsi.code, 'useful values', default='')
sig_fn = jsi.extract_function_code(funcname)
if var_ay:
sig_fn = (sig_fn[0], ';\n'.join((var_ay, sig_fn[1])))
return sig_fn
def _parse_sig_js(self, jscode):
# Examples where `sig` is funcname:
# sig=function(a){a=a.split(""); ... ;return a.join("")};
@ -1736,8 +1751,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
jscode, 'Initial JS player signature function name', group='sig')
jsi = JSInterpreter(jscode)
initial_function = jsi.extract_function(funcname)
return lambda s: initial_function([s])
initial_function = self._extract_sig_fn(jsi, funcname)
func = jsi.extract_function_from_code(*initial_function)
return lambda s: func([s])
def _cached(self, func, *cache_id):
def inner(*args, **kwargs):
@ -1856,15 +1875,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
def _extract_n_function_code_jsi(self, video_id, jsi, player_id=None):
var_ay = self._search_regex(
r'(?:[;\s]|^)\s*(var\s*[\w$]+\s*=\s*"(?:\\"|[^"])+"\s*\.\s*split\("\W+"\))(?=\s*[,;])',
jsi.code, 'useful values', default='')
func_name = self._extract_n_function_name(jsi.code)
func_code = jsi.extract_function_code(func_name)
if var_ay:
func_code = (func_code[0], ';\n'.join((var_ay, func_code[1])))
func_code = self._extract_sig_fn(jsi, func_name)
if player_id:
self.cache.store('youtube-nsig', player_id, func_code)
@ -2136,7 +2149,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
video_details = merge_dicts(*traverse_obj(
(player_response, api_player_response),
(Ellipsis, 'videoDetails', T(dict))))
player_response.update(api_player_response or {})
player_response.update(filter_dict(
api_player_response or {}, cndn=lambda k, _: k != 'captions'))
player_response['videoDetails'] = video_details
def is_agegated(playability):
@ -2566,8 +2580,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
}
pctr = traverse_obj(
player_response,
('captions', 'playerCaptionsTracklistRenderer', T(dict)))
(player_response, api_player_response),
(Ellipsis, 'captions', 'playerCaptionsTracklistRenderer', T(dict)))
if pctr:
def process_language(container, base_url, lang_code, query):
lang_subs = []
@ -2584,20 +2598,21 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
def process_subtitles():
subtitles = {}
for caption_track in traverse_obj(pctr, (
'captionTracks', lambda _, v: v.get('baseUrl'))):
Ellipsis, 'captionTracks', lambda _, v: (
v.get('baseUrl') and v.get('languageCode')))):
base_url = self._yt_urljoin(caption_track['baseUrl'])
if not base_url:
continue
lang_code = caption_track['languageCode']
if caption_track.get('kind') != 'asr':
lang_code = caption_track.get('languageCode')
if not lang_code:
continue
process_language(
subtitles, base_url, lang_code, {})
continue
automatic_captions = {}
process_language(
automatic_captions, base_url, lang_code, {})
for translation_language in traverse_obj(pctr, (
'translationLanguages', lambda _, v: v.get('languageCode'))):
Ellipsis, 'translationLanguages', lambda _, v: v.get('languageCode'))):
translation_language_code = translation_language['languageCode']
process_language(
automatic_captions, base_url, translation_language_code,

View File

@ -678,7 +678,7 @@ class JSInterpreter(object):
return len(obj)
try:
return obj[int(idx)] if isinstance(obj, list) else obj[compat_str(idx)]
except (TypeError, KeyError, IndexError) as e:
except (TypeError, KeyError, IndexError, ValueError) as e:
# allow_undefined is None gives correct behaviour
if allow_undefined or (
allow_undefined is None and not isinstance(e, TypeError)):
@ -1038,6 +1038,10 @@ class JSInterpreter(object):
left_val = self._index(left_val, idx)
if isinstance(idx, float):
idx = int(idx)
if isinstance(left_val, list) and len(left_val) <= int_or_none(idx, default=-1):
# JS Array is a sparsely assignable list
# TODO: handle extreme sparsity without memory bloat, eg using auxiliary dict
left_val.extend((idx - len(left_val) + 1) * [JS_Undefined])
left_val[idx] = self._operator(
m.group('op'), self._index(left_val, idx) if m.group('op') else None,
m.group('expr'), expr, local_vars, allow_recursion)
@ -1204,9 +1208,10 @@ class JSInterpreter(object):
elif member == 'join':
assertion(isinstance(obj, list), 'must be applied on a list')
assertion(len(argvals) <= 1, 'takes at most one argument')
return (',' if len(argvals) == 0 else argvals[0]).join(
('' if x in (None, JS_Undefined) else _js_toString(x))
for x in obj)
return (',' if len(argvals) == 0 or argvals[0] in (None, JS_Undefined)
else argvals[0]).join(
('' if x in (None, JS_Undefined) else _js_toString(x))
for x in obj)
elif member == 'reverse':
assertion(not argvals, 'does not take any arguments')
obj.reverse()
@ -1364,19 +1369,21 @@ class JSInterpreter(object):
code, _ = self._separate_at_paren(func_m.group('code')) # refine the match
return self.build_arglist(func_m.group('args')), 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(*itertools.chain(
self.extract_function_code(funcname), global_stack)),
'F<%s>' % (funcname,))
def extract_function_from_code(self, argnames, code, *global_stack):
local_vars = {}
start = None
while True:
mobj = re.search(r'function\((?P<args>[^)]*)\)\s*{', code)
mobj = re.search(r'function\((?P<args>[^)]*)\)\s*{', code[start:])
if mobj is None:
break
start, body_start = mobj.span()
start, body_start = ((start or 0) + x for x in mobj.span())
body, remaining = self._separate_at_paren(code[body_start - 1:])
name = self._named_object(local_vars, self.extract_function_from_code(
[x.strip() for x in mobj.group('args').split(',')],