artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-04-28 03:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor video password logic

Browse Source 
Authored by: bashonly
This commit is contained in:
bashonly 2025-04-28 18:42:54 -05:00
parent fc25e7f9e9
commit 4cc7c6b134
No known key found for this signature in database
GPG Key ID: 783F096F253D15B0
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yt_dlp/extractor/vimeo.py
View File

@ -96,13 +96,16 @@ class VimeoBaseInfoExtractor(InfoExtractor):
expected=True) expected=True)
return password return password
def _verify_video_password(self, video_id, password, token): def _verify_video_password(self, video_id):
video_password = self._get_video_password()
token = self._download_json(
'https://vimeo.com/_next/viewer', video_id, 'Downloading viewer info')['xsrft']
url = f'https://vimeo.com/{video_id}' url = f'https://vimeo.com/{video_id}'
try: try:
return self._download_webpage( self._request_webpage(
f'{url}/password', video_id, f'{url}/password', video_id,
'Submitting video password', data=json.dumps({ 'Submitting video password', data=json.dumps({
'password': password, 'password': video_password,
'token': token, 'token': token,
}, separators=(',', ':')).encode(), headers={ }, separators=(',', ':')).encode(), headers={
'Accept': '*/*', 'Accept': '*/*',
@ -900,10 +903,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
self._webpage_read_content(e.cause.response, e.cause.response.url, video_id, fatal=False), self._webpage_read_content(e.cause.response, e.cause.response.url, video_id, fatal=False),
({json.loads}, 'invalid_parameters', ..., 'field'), ({json.loads}, 'invalid_parameters', ..., 'field'),
)): )):
viewer = self._download_json( self._verify_video_password(video_id)
'https://vimeo.com/_next/viewer', video_id, 'Downloading viewer info')
self._verify_video_password(
video_id, self._get_video_password(), viewer['xsrft'])
continue continue
raise raise
@ -1453,12 +1453,8 @@ class VimeoReviewIE(VimeoBaseInfoExtractor):
user, video_id, review_hash = self._match_valid_url(url).group('user', 'id', 'hash') user, video_id, review_hash = self._match_valid_url(url).group('user', 'id', 'hash')
data_url = f'https://vimeo.com/{user}/review/data/{video_id}/{review_hash}' data_url = f'https://vimeo.com/{user}/review/data/{video_id}/{review_hash}'
data = self._download_json(data_url, video_id) data = self._download_json(data_url, video_id)
viewer = {}
if data.get('isLocked') is True: if data.get('isLocked') is True:
video_password = self._get_video_password() self._verify_video_password(video_id)
viewer = self._download_json(
'https://vimeo.com/_rv/viewer', video_id)
self._verify_video_password(video_id, video_password, viewer['xsrft'])
data = self._download_json(data_url, video_id) data = self._download_json(data_url, video_id)
clip_data = data['clipData'] clip_data = data['clipData']
config_url = clip_data['configUrl'] config_url = clip_data['configUrl']