mirror of
https://github.com/ytdl-org/youtube-dl
synced 2025-05-29 17:12:41 +09:00
Compare commits
23 Commits
dca6d55e9e
...
012b58d63e
Author | SHA1 | Date | |
---|---|---|---|
![]() |
012b58d63e | ||
![]() |
2b4fbfce25 | ||
![]() |
1bc45b8b6c | ||
![]() |
b982d77d0b | ||
![]() |
c55dbf4838 | ||
![]() |
087d865230 | ||
![]() |
a4fc1151f1 | ||
![]() |
a464c159e6 | ||
![]() |
7dca08eff0 | ||
![]() |
2239ee7965 | ||
![]() |
76738e4832 | ||
![]() |
191d1d0a85 | ||
![]() |
9d2b2f9b1e | ||
![]() |
8414d8d8f5 | ||
![]() |
1e522505be | ||
![]() |
9c5c778792 | ||
![]() |
f2398c0070 | ||
![]() |
a6a1c149d6 | ||
![]() |
aaafaa2cb8 | ||
![]() |
ba4c5b3a2e | ||
![]() |
a59f77ebab | ||
![]() |
c0bda232e9 | ||
![]() |
6b7441ed64 |
@ -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)
|
||||
|
||||
|
@ -1549,6 +1549,11 @@ from .vvvvid import (
|
||||
VVVVIDIE,
|
||||
VVVVIDShowIE,
|
||||
)
|
||||
from .vxxx import (
|
||||
InPornIE,
|
||||
MrGayIE,
|
||||
VXXXIE,
|
||||
)
|
||||
from .vyborymos import VyboryMosIE
|
||||
from .vzaar import VzaarIE
|
||||
from .wakanim import WakanimIE
|
||||
|
240
youtube_dl/extractor/vxxx.py
Normal file
240
youtube_dl/extractor/vxxx.py
Normal file
@ -0,0 +1,240 @@
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import base64
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
float_or_none,
|
||||
int_or_none,
|
||||
parse_duration,
|
||||
strip_or_none,
|
||||
unified_timestamp,
|
||||
url_or_none,
|
||||
)
|
||||
|
||||
|
||||
class VXXXIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://vxxx\.com/video-(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://vxxx.com/video-80747/',
|
||||
'md5': '2f4bfd829b682ff9e3da1bda71b81b81',
|
||||
'info_dict': {
|
||||
'id': '80747',
|
||||
'ext': 'mp4',
|
||||
'title': 'Monica Aka Selina',
|
||||
'display_id': 'monica-aka-selina',
|
||||
'thumbnail': 'https://tn.vxxx.com/contents/videos_screenshots/80000/80747/420x236/1.jpg',
|
||||
'description': None,
|
||||
'timestamp': 1607167706,
|
||||
'upload_date': '20201205',
|
||||
'duration': 2373.0,
|
||||
'categories': ['Anal', 'Asian', 'BDSM', 'Brunette', 'Toys',
|
||||
'Fetish', 'HD', 'Interracial', 'MILF'],
|
||||
'age_limit': 18,
|
||||
}
|
||||
}]
|
||||
|
||||
_BASE_URL = 'https://vxxx.com'
|
||||
_INFO_OBJECT_URL_TMPL = '{0}/api/json/video/86400/0/{1}/{2}.json'
|
||||
_FORMAT_OBJECT_URL_TMPL = '{0}/api/videofile.php?video_id={1}'
|
||||
|
||||
def _download_info_object(self, video_id):
|
||||
return self._download_json(
|
||||
self._INFO_OBJECT_URL_TMPL.format(
|
||||
self._BASE_URL,
|
||||
int(video_id) // 1000 * 1000,
|
||||
video_id,
|
||||
), video_id, headers={'Referer': self._BASE_URL})['video']
|
||||
|
||||
def _download_format_object(self, video_id):
|
||||
return self._download_json(
|
||||
self._FORMAT_OBJECT_URL_TMPL.format(self._BASE_URL, video_id),
|
||||
video_id,
|
||||
headers={'Referer': self._BASE_URL}
|
||||
)
|
||||
|
||||
def _decode_base164(self, e):
|
||||
"""
|
||||
Some non-standard encoding called "base164" in the JavaScript code. It's
|
||||
similar to the regular base64 with a slightly different alphabet:
|
||||
- "АВСЕМ" are Cyrillic letters instead of uppercase Latin letters
|
||||
- "." is used instead of "+"; "," is used instead of "/"
|
||||
- "~" is used for padding instead of "="
|
||||
"""
|
||||
|
||||
# using the kwarg to memoise the result
|
||||
def get_trans_tbl(from_, to, tbl={}):
|
||||
k = (from_, to)
|
||||
if not tbl.get(k):
|
||||
tbl[k] = str.maketrans(from_, to)
|
||||
return tbl[k]
|
||||
|
||||
trans_tbl = get_trans_tbl(
|
||||
'\u0410\u0412\u0421\u0415\u041c.,~',
|
||||
'ABCEM+/=')
|
||||
return base64.b64decode(e.translate(trans_tbl)).decode()
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
|
||||
info_object = self._download_info_object(video_id)
|
||||
|
||||
title = info_object['title']
|
||||
stats = info_object.get('statistics') or {}
|
||||
info = {
|
||||
'id': video_id,
|
||||
'title': title,
|
||||
'display_id': info_object.get('dir'),
|
||||
'thumbnail': url_or_none(info_object.get('thumb')),
|
||||
'description': strip_or_none(info_object.get('description')) or None,
|
||||
'timestamp': unified_timestamp(info_object.get('post_date')),
|
||||
'duration': parse_duration(info_object.get('duration')),
|
||||
'view_count': int_or_none(stats.get('viewed')),
|
||||
'like_count': int_or_none(stats.get('likes')),
|
||||
'dislike_count': int_or_none(stats.get('dislikes')),
|
||||
'average_rating': float_or_none(stats.get('rating')),
|
||||
'categories': [category['title'] for category in (info_object.get('categories') or {}).values()
|
||||
if category.get('title')],
|
||||
'age_limit': 18,
|
||||
}
|
||||
|
||||
format_object = self._download_format_object(video_id)
|
||||
m3u8_formats = self._extract_m3u8_formats(
|
||||
'{0}/{1}&f=video.m3u8'.format(
|
||||
self._BASE_URL,
|
||||
self._decode_base164(format_object[0]['video_url'])
|
||||
),
|
||||
video_id, 'mp4')
|
||||
self._sort_formats(m3u8_formats)
|
||||
info['formats'] = m3u8_formats
|
||||
|
||||
return info
|
||||
|
||||
|
||||
class InPornIE(VXXXIE):
|
||||
_VALID_URL = r'https?://(?:www\.)?inporn\.com/video/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://inporn.com/video/533613/2k-t-2nd-season-parm-151/',
|
||||
'md5': 'c358d1da6b451ebe7cfb00dd89741607',
|
||||
'info_dict': {
|
||||
'id': '533613',
|
||||
'ext': 'mp4',
|
||||
'title': '2k 美月まい - ガーリー系アパレルモt゙ルの挑発パンチラ 2nd Season [parm-151]',
|
||||
'display_id': '2k-t-2nd-season-parm-151',
|
||||
'thumbnail': 'https://tn.inporn.com/media/tn/533613_1.jpg',
|
||||
'description': None,
|
||||
'timestamp': 1664571262,
|
||||
'upload_date': '20220930',
|
||||
'duration': 480.0,
|
||||
'categories': ['Asian', 'Brunette', 'Casting', 'HD', 'Japanese',
|
||||
'JAV Uncensored'],
|
||||
'age_limit': 18,
|
||||
},
|
||||
}]
|
||||
|
||||
_BASE_URL = 'https://inporn.com'
|
||||
|
||||
|
||||
class MrGayIE(VXXXIE):
|
||||
_VALID_URL = r'https?://mrgay\.com/video/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://mrgay.com/video/10169199/jpn-crossdresser-6/',
|
||||
'md5': 'b5780a9437c205b4bc87eb939b23e8ef',
|
||||
'info_dict': {
|
||||
'id': '10169199',
|
||||
'ext': 'mp4',
|
||||
'title': 'Jpn Crossdresser 6',
|
||||
'display_id': 'jpn-crossdresser-6',
|
||||
'thumbnail': 'https://tn.mrgay.com/media/tn/10169199_1.jpg',
|
||||
'description': None,
|
||||
'timestamp': 1651066888,
|
||||
'upload_date': '20220427',
|
||||
'duration': 834.0,
|
||||
'categories': ['Amateur', 'Asian', 'Brunette', 'Crossdressing',
|
||||
'Japanese', 'Webcam'],
|
||||
'age_limit': 18,
|
||||
}
|
||||
}]
|
||||
|
||||
_BASE_URL = 'https://mrgay.com'
|
||||
|
||||
|
||||
# The following three extractors are for "friend" sites whose videos could be
|
||||
# extracted in the same way, but unsupported by youtube-dl due to missing proper
|
||||
# DMCA notices. Consider re-enable them if their DMCA pages become available.
|
||||
class BdsmxTubeIE(VXXXIE):
|
||||
_VALID_URL = r'https?://bdsmx\.tube/video/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://bdsmx.tube/video/127583/latex-puppy-leashed/',
|
||||
'md5': '79751d4ed75668afe07a660c4bcb2f1b',
|
||||
'info_dict': {
|
||||
'id': '127583',
|
||||
'ext': 'mp4',
|
||||
'title': 'Latex Puppy Leashed',
|
||||
'display_id': 'latex-puppy-leashed',
|
||||
'thumbnail': 'https://tn.bdsmx-porn.com/contents/videos_screenshots/127000/127583/480x270/1.jpg',
|
||||
'description': None,
|
||||
'timestamp': 1651003323,
|
||||
'upload_date': '20220426',
|
||||
'duration': 68.0,
|
||||
'categories': ['Asian', 'Brunette', 'Cosplay', 'Fetish',
|
||||
'Fuck Machine', 'Gagging', 'Japanese',
|
||||
'JAV Uncensored', 'Latex', 'Leather', 'POV'],
|
||||
'age_limit': 18,
|
||||
}
|
||||
}]
|
||||
_WORKING = False
|
||||
|
||||
_BASE_URL = 'https://bdsmx.tube'
|
||||
|
||||
|
||||
class BlackPornTubeIE(VXXXIE):
|
||||
_VALID_URL = r'https?://blackporn\.tube/video/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://blackporn.tube/video/10043813/young-ebony-babe-gets-super-wet/',
|
||||
'md5': '4a4c126970f2f1453b8b2050947fc870',
|
||||
'info_dict': {
|
||||
'id': '10043813',
|
||||
'ext': 'mp4',
|
||||
'title': 'Young Ebony Babe Gets Super Wet',
|
||||
'display_id': 'young-ebony-babe-gets-super-wet',
|
||||
'thumbnail': 'https://tn.blackporn.tube/contents/videos_screenshots/10043000/10043813/480x270/1.jpg',
|
||||
'description': None,
|
||||
'timestamp': 1654806141,
|
||||
'upload_date': '20220609',
|
||||
'duration': 193.0,
|
||||
'categories': ['BDSM', 'Bondage', 'Celebrity', 'Ebony', 'Fetish',
|
||||
'Shibari Bondage', 'Solo Female',
|
||||
'Tattoo'],
|
||||
'age_limit': 18,
|
||||
}
|
||||
}]
|
||||
_WORKING = False
|
||||
|
||||
_BASE_URL = 'https://blackporn.tube'
|
||||
|
||||
|
||||
class XMilfIE(VXXXIE):
|
||||
_VALID_URL = r'https?://xmilf\.com/video/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://xmilf.com/video/143777/big-boob-brunette-masturbates3/',
|
||||
'md5': 'a196fe8daebe194a758754c81e9232ad',
|
||||
'info_dict': {
|
||||
'id': '143777',
|
||||
'ext': 'mp4',
|
||||
'title': 'Big Boob Brunette Masturbates',
|
||||
'display_id': 'big-boob-brunette-masturbates3',
|
||||
'thumbnail': 'https://tn.xmilf.com/contents/videos_screenshots/143000/143777/480x270/1.jpg',
|
||||
'description': None,
|
||||
'timestamp': 1662465481,
|
||||
'upload_date': '20220906',
|
||||
'duration': 480.0,
|
||||
'categories': ['Amateur', 'Big Tits', 'Brunette', 'Fetish', 'HD',
|
||||
'Lingerie', 'MILF', 'Webcam'],
|
||||
'age_limit': 18,
|
||||
}
|
||||
}]
|
||||
_WORKING = False
|
||||
|
||||
_BASE_URL = 'https://xmilf.com'
|
@ -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,
|
||||
|
@ -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(',')],
|
||||
|
Loading…
x
Reference in New Issue
Block a user