mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-08-25 22:08:31 +00:00
[ie/vimeo:album] Support embed-only and non-numeric albums (#14021)
Authored by: bashonly
This commit is contained in:
bashonly
GitHub
parent
0f6b915822
commit
d8200ff0a4
@ -28,7 +28,6 @@
|
||||
qualities,
|
||||
smuggle_url,
|
||||
str_or_none,
|
||||
traverse_obj,
|
||||
try_call,
|
||||
try_get,
|
||||
unified_timestamp,
|
||||
@ -39,6 +38,7 @@
|
||||
urlhandle_detect_ext,
|
||||
urljoin,
|
||||
)
|
||||
from ..utils.traversal import require, traverse_obj
|
||||
|
||||
|
||||
class VimeoBaseInfoExtractor(InfoExtractor):
|
||||
@ -117,13 +117,13 @@ def _unsmuggle_headers(self, url):
|
||||
def _jwt_is_expired(self, token):
|
||||
return jwt_decode_hs256(token)['exp'] - time.time() < 120
|
||||
|
||||
def _fetch_viewer_info(self, display_id=None, fatal=True):
|
||||
def _fetch_viewer_info(self, display_id=None):
|
||||
if self._viewer_info and not self._jwt_is_expired(self._viewer_info['jwt']):
|
||||
return self._viewer_info
|
||||
|
||||
self._viewer_info = self._download_json(
|
||||
'https://vimeo.com/_next/viewer', display_id, 'Downloading web token info',
|
||||
'Failed to download web token info', fatal=fatal, headers={'Accept': 'application/json'})
|
||||
'Failed to download web token info', headers={'Accept': 'application/json'})
|
||||
|
||||
return self._viewer_info
|
||||
|
||||
@ -502,6 +502,43 @@ def _extract_original_format(self, url, video_id, unlisted_hash=None):
|
||||
'quality': 1,
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def _get_embed_params(is_embed, referer):
|
||||
return {
|
||||
'is_embed': 'true' if is_embed else 'false',
|
||||
'referrer': urllib.parse.urlparse(referer).hostname if referer and is_embed else '',
|
||||
}
|
||||
|
||||
def _get_album_data_and_hashed_pass(self, album_id, is_embed, referer):
|
||||
viewer = self._fetch_viewer_info(album_id)
|
||||
jwt = viewer['jwt']
|
||||
album = self._download_json(
|
||||
'https://api.vimeo.com/albums/' + album_id,
|
||||
album_id, headers={'Authorization': 'jwt ' + jwt, 'Accept': 'application/json'},
|
||||
query={**self._get_embed_params(is_embed, referer), 'fields': 'description,name,privacy'})
|
||||
hashed_pass = None
|
||||
if traverse_obj(album, ('privacy', 'view')) == 'password':
|
||||
password = self.get_param('videopassword')
|
||||
if not password:
|
||||
raise ExtractorError(
|
||||
'This album is protected by a password, use the --video-password option',
|
||||
expected=True)
|
||||
try:
|
||||
hashed_pass = self._download_json(
|
||||
f'https://vimeo.com/showcase/{album_id}/auth',
|
||||
album_id, 'Verifying the password', data=urlencode_postdata({
|
||||
'password': password,
|
||||
'token': viewer['xsrft'],
|
||||
}), headers={
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
})['hashed_pass']
|
||||
except ExtractorError as e:
|
||||
if isinstance(e.cause, HTTPError) and e.cause.status == 401:
|
||||
raise ExtractorError('Wrong password', expected=True)
|
||||
raise
|
||||
|
||||
return album, hashed_pass
|
||||
|
||||
|
||||
class VimeoIE(VimeoBaseInfoExtractor):
|
||||
"""Information extractor for vimeo.com."""
|
||||
@ -1188,42 +1225,6 @@ def _extract_from_api(self, video_id, unlisted_hash=None):
|
||||
info[k + '_count'] = int_or_none(try_get(connections, lambda x: x[k + 's']['total']))
|
||||
return info
|
||||
|
||||
def _try_album_password(self, url):
|
||||
album_id = self._search_regex(
|
||||
r'vimeo\.com/(?:album|showcase)/([^/]+)', url, 'album id', default=None)
|
||||
if not album_id:
|
||||
return
|
||||
viewer = self._fetch_viewer_info(album_id, fatal=False)
|
||||
if not viewer:
|
||||
webpage = self._download_webpage(url, album_id)
|
||||
viewer = self._parse_json(self._search_regex(
|
||||
r'bootstrap_data\s*=\s*({.+?})</script>',
|
||||
webpage, 'bootstrap data'), album_id)['viewer']
|
||||
jwt = viewer['jwt']
|
||||
album = self._download_json(
|
||||
'https://api.vimeo.com/albums/' + album_id,
|
||||
album_id, headers={'Authorization': 'jwt ' + jwt, 'Accept': 'application/json'},
|
||||
query={'fields': 'description,name,privacy'})
|
||||
if try_get(album, lambda x: x['privacy']['view']) == 'password':
|
||||
password = self.get_param('videopassword')
|
||||
if not password:
|
||||
raise ExtractorError(
|
||||
'This album is protected by a password, use the --video-password option',
|
||||
expected=True)
|
||||
try:
|
||||
self._download_json(
|
||||
f'https://vimeo.com/showcase/{album_id}/auth',
|
||||
album_id, 'Verifying the password', data=urlencode_postdata({
|
||||
'password': password,
|
||||
'token': viewer['xsrft'],
|
||||
}), headers={
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
})
|
||||
except ExtractorError as e:
|
||||
if isinstance(e.cause, HTTPError) and e.cause.status == 401:
|
||||
raise ExtractorError('Wrong password', expected=True)
|
||||
raise
|
||||
|
||||
def _real_extract(self, url):
|
||||
url, data, headers = self._unsmuggle_headers(url)
|
||||
if 'Referer' not in headers:
|
||||
@ -1238,8 +1239,14 @@ def _real_extract(self, url):
|
||||
if any(p in url for p in ('play_redirect_hls', 'moogaloop.swf')):
|
||||
url = 'https://vimeo.com/' + video_id
|
||||
|
||||
self._try_album_password(url)
|
||||
is_secure = urllib.parse.urlparse(url).scheme == 'https'
|
||||
album_id = self._search_regex(
|
||||
r'vimeo\.com/(?:album|showcase)/([0-9]+)/', url, 'album id', default=None)
|
||||
if album_id:
|
||||
# Detect password-protected showcase video => POST album password => set cookies
|
||||
self._get_album_data_and_hashed_pass(album_id, False, None)
|
||||
|
||||
parsed_url = urllib.parse.urlparse(url)
|
||||
is_secure = parsed_url.scheme == 'https'
|
||||
try:
|
||||
# Retrieve video webpage to extract further information
|
||||
webpage, urlh = self._download_webpage_handle(
|
||||
@ -1265,7 +1272,7 @@ def _real_extract(self, url):
|
||||
f'{self._downloader._format_err("compromising your security/cookies", "light red")}, '
|
||||
f'try replacing "https:" with "http:" in the input URL. {dcip_msg}.', expected=True)
|
||||
|
||||
if '://player.vimeo.com/video/' in url:
|
||||
if parsed_url.hostname == 'player.vimeo.com':
|
||||
config = self._search_json(
|
||||
r'\b(?:playerC|c)onfig\s*=', webpage, 'info section', video_id)
|
||||
if config.get('view') == 4:
|
||||
@ -1293,7 +1300,7 @@ def _real_extract(self, url):
|
||||
config_url = None
|
||||
|
||||
channel_id = self._search_regex(
|
||||
r'vimeo\.com/channels/([^/]+)', url, 'channel id', default=None)
|
||||
r'vimeo\.com/channels/([^/?#]+)', url, 'channel id', default=None)
|
||||
if channel_id:
|
||||
config_url = self._extract_config_url(webpage, default=None)
|
||||
video_description = clean_html(get_element_by_class('description', webpage))
|
||||
@ -1531,7 +1538,7 @@ class VimeoUserIE(VimeoChannelIE): # XXX: Do not subclass from concrete IE
|
||||
|
||||
class VimeoAlbumIE(VimeoBaseInfoExtractor):
|
||||
IE_NAME = 'vimeo:album'
|
||||
_VALID_URL = r'https://vimeo\.com/(?:album|showcase)/(?P<id>\d+)(?:$|[?#]|/(?!video))'
|
||||
_VALID_URL = r'https://vimeo\.com/(?:album|showcase)/(?P<id>[^/?#]+)(?:$|[?#]|(?P<is_embed>/embed))'
|
||||
_TITLE_RE = r'<header id="page_header">\n\s*<h1>(.*?)</h1>'
|
||||
_TESTS = [{
|
||||
'url': 'https://vimeo.com/album/2632481',
|
||||
@ -1549,12 +1556,63 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
|
||||
},
|
||||
'playlist_count': 1,
|
||||
'params': {'videopassword': 'youtube-dl'},
|
||||
}, {
|
||||
'note': 'embedded album that requires "referrer" in query (smuggled)',
|
||||
'url': 'https://vimeo.com/showcase/10677689/embed#__youtubedl_smuggle=%7B%22referer%22%3A+%22https%3A%2F%2Fwww.riccardomutimusic.com%2F%22%7D',
|
||||
'info_dict': {
|
||||
'title': 'La Traviata - la serie completa',
|
||||
'id': '10677689',
|
||||
},
|
||||
'playlist': [{
|
||||
'url': 'https://player.vimeo.com/video/505682113#__youtubedl_smuggle=%7B%22referer%22%3A+%22https%3A%2F%2Fwww.riccardomutimusic.com%2F%22%7D',
|
||||
'info_dict': {
|
||||
'id': '505682113',
|
||||
'ext': 'mp4',
|
||||
'title': 'La Traviata - Episodio 7',
|
||||
'uploader': 'RMMusic',
|
||||
'uploader_id': 'user62556494',
|
||||
'uploader_url': 'https://vimeo.com/user62556494',
|
||||
'duration': 3202,
|
||||
'thumbnail': r're:https?://i\.vimeocdn\.com/video/.+',
|
||||
},
|
||||
}],
|
||||
'params': {
|
||||
'playlist_items': '1',
|
||||
'skip_download': 'm3u8',
|
||||
},
|
||||
'expected_warnings': ['Failed to parse XML: not well-formed'],
|
||||
}, {
|
||||
'note': 'embedded album that requires "referrer" in query (passed as param)',
|
||||
'url': 'https://vimeo.com/showcase/10677689/embed',
|
||||
'info_dict': {
|
||||
'title': 'La Traviata - la serie completa',
|
||||
'id': '10677689',
|
||||
},
|
||||
'playlist_mincount': 9,
|
||||
'params': {'http_headers': {'Referer': 'https://www.riccardomutimusic.com/'}},
|
||||
}, {
|
||||
'url': 'https://vimeo.com/showcase/11803104/embed2',
|
||||
'info_dict': {
|
||||
'title': 'Romans Video Ministry',
|
||||
'id': '11803104',
|
||||
},
|
||||
'playlist_mincount': 41,
|
||||
}, {
|
||||
'note': 'non-numeric slug, need to fetch numeric album ID',
|
||||
'url': 'https://vimeo.com/showcase/BethelTally-Homegoing-Services',
|
||||
'info_dict': {
|
||||
'title': 'BethelTally Homegoing Services',
|
||||
'id': '11547429',
|
||||
'description': 'Bethel Missionary Baptist Church\nTallahassee, FL',
|
||||
},
|
||||
'playlist_mincount': 8,
|
||||
}]
|
||||
_PAGE_SIZE = 100
|
||||
|
||||
def _fetch_page(self, album_id, authorization, hashed_pass, page):
|
||||
def _fetch_page(self, album_id, hashed_pass, is_embed, referer, page):
|
||||
api_page = page + 1
|
||||
query = {
|
||||
**self._get_embed_params(is_embed, referer),
|
||||
'fields': 'link,uri',
|
||||
'page': api_page,
|
||||
'per_page': self._PAGE_SIZE,
|
||||
@ -1565,7 +1623,7 @@ def _fetch_page(self, album_id, authorization, hashed_pass, page):
|
||||
videos = self._download_json(
|
||||
f'https://api.vimeo.com/albums/{album_id}/videos',
|
||||
album_id, f'Downloading page {api_page}', query=query, headers={
|
||||
'Authorization': 'jwt ' + authorization,
|
||||
'Authorization': 'jwt ' + self._fetch_viewer_info(album_id)['jwt'],
|
||||
'Accept': 'application/json',
|
||||
})['data']
|
||||
except ExtractorError as e:
|
||||
@ -1577,44 +1635,37 @@ def _fetch_page(self, album_id, authorization, hashed_pass, page):
|
||||
if not link:
|
||||
continue
|
||||
uri = video.get('uri')
|
||||
video_id = self._search_regex(r'/videos/(\d+)', uri, 'video_id', default=None) if uri else None
|
||||
video_id = self._search_regex(r'/videos/(\d+)', uri, 'id', default=None) if uri else None
|
||||
if is_embed:
|
||||
if not video_id:
|
||||
self.report_warning(f'Skipping due to missing video ID: {link}')
|
||||
continue
|
||||
link = f'https://player.vimeo.com/video/{video_id}'
|
||||
if referer:
|
||||
link = self._smuggle_referrer(link, referer)
|
||||
yield self.url_result(link, VimeoIE.ie_key(), video_id)
|
||||
|
||||
def _real_extract(self, url):
|
||||
album_id = self._match_id(url)
|
||||
viewer = self._fetch_viewer_info(album_id, fatal=False)
|
||||
if not viewer:
|
||||
webpage = self._download_webpage(url, album_id)
|
||||
viewer = self._parse_json(self._search_regex(
|
||||
r'bootstrap_data\s*=\s*({.+?})</script>',
|
||||
webpage, 'bootstrap data'), album_id)['viewer']
|
||||
jwt = viewer['jwt']
|
||||
album = self._download_json(
|
||||
'https://api.vimeo.com/albums/' + album_id,
|
||||
album_id, headers={'Authorization': 'jwt ' + jwt, 'Accept': 'application/json'},
|
||||
query={'fields': 'description,name,privacy'})
|
||||
hashed_pass = None
|
||||
if try_get(album, lambda x: x['privacy']['view']) == 'password':
|
||||
password = self.get_param('videopassword')
|
||||
if not password:
|
||||
raise ExtractorError(
|
||||
'This album is protected by a password, use the --video-password option',
|
||||
expected=True)
|
||||
try:
|
||||
hashed_pass = self._download_json(
|
||||
f'https://vimeo.com/showcase/{album_id}/auth',
|
||||
album_id, 'Verifying the password', data=urlencode_postdata({
|
||||
'password': password,
|
||||
'token': viewer['xsrft'],
|
||||
}), headers={
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
})['hashed_pass']
|
||||
except ExtractorError as e:
|
||||
if isinstance(e.cause, HTTPError) and e.cause.status == 401:
|
||||
raise ExtractorError('Wrong password', expected=True)
|
||||
raise
|
||||
url, _, http_headers = self._unsmuggle_headers(url)
|
||||
album_id, is_embed = self._match_valid_url(url).group('id', 'is_embed')
|
||||
referer = http_headers.get('Referer')
|
||||
|
||||
if not re.fullmatch(r'[0-9]+', album_id):
|
||||
auth_info = self._download_json(
|
||||
f'https://vimeo.com/showcase/{album_id}/auth', album_id, 'Downloading album info',
|
||||
headers={'X-Requested-With': 'XMLHttpRequest'}, expected_status=(401, 403))
|
||||
album_id = traverse_obj(auth_info, (
|
||||
'metadata', 'id', {int}, {str_or_none}, {require('album ID')}))
|
||||
|
||||
try:
|
||||
album, hashed_pass = self._get_album_data_and_hashed_pass(album_id, is_embed, referer)
|
||||
except ExtractorError as e:
|
||||
if is_embed and not referer and isinstance(e.cause, HTTPError) and e.cause.status == 403:
|
||||
raise ExtractorError(self._REFERER_HINT, expected=True)
|
||||
raise
|
||||
|
||||
entries = OnDemandPagedList(functools.partial(
|
||||
self._fetch_page, album_id, jwt, hashed_pass), self._PAGE_SIZE)
|
||||
self._fetch_page, album_id, hashed_pass, is_embed, referer), self._PAGE_SIZE)
|
||||
return self.playlist_result(
|
||||
entries, album_id, album.get('name'), album.get('description'))
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user