A feature-rich command-line audio/video downloader
[ie/vimeo] Fix API extraction (#12976)
bashonlyd596824c2f84
diff --git a/yt_dlp/extractor/vimeo.py b/yt_dlp/extractor/vimeo.pyindex 8a0aaaa464..62b8db3829 100644--- a/yt_dlp/extractor/vimeo.py+++ b/yt_dlp/extractor/vimeo.py@@ -244,9 +244,13 @@ class VimeoBaseInfoExtractor(InfoExtractor):join_nonempty(f'https://api.vimeo.com/videos/{video_id}', unlisted_hash, delim=':'),video_id, 'Downloading API JSON', headers={'Authorization': f'jwt {jwt_token}',- 'Accept': 'application/json',+ 'Accept': 'application/vnd.vimeo.*+json;version=3.4.10',}, query={+ # TODO: Reverse-engineer generating the 'anon_signature' param+ # Ref: https://f.vimeocdn.com/js_opt/app/vimeo-next/_next/static/chunks/60908-af70235e46909bce.js+ 'outro': 'beginning', # Needed to avoid https://github.com/yt-dlp/yt-dlp/issues/12974'fields': ','.join((+ # 'embed_player_config_url' is a viable alternative to 'config_url''config_url', 'created_time', 'description', 'download', 'license','metadata.connections.comments.total', 'metadata.connections.likes.total','release_time', 'stats.plays')),@@ -410,6 +414,7 @@ class VimeoIE(VimeoBaseInfoExtractor):'duration': 10,'comment_count': int,'like_count': int,+ 'view_count': int,'thumbnail': 'https://i.vimeocdn.com/video/440665496-b2c5aee2b61089442c794f64113a8e8f7d5763c3e6b3ebfaf696ae6413f8b1f4-d',},'params': {@@ -500,15 +505,16 @@ class VimeoIE(VimeoBaseInfoExtractor):'uploader': 'The DMCI','uploader_url': r're:https?://(?:www\.)?vimeo\.com/dmci','uploader_id': 'dmci',- 'timestamp': 1324343742,+ 'timestamp': 1324361742,'upload_date': '20111220',- 'description': 'md5:ae23671e82d05415868f7ad1aec21147',+ 'description': 'md5:f37b4ad0f3ded6fa16f38ecde16c3c44','duration': 60,'comment_count': int,'view_count': int,'thumbnail': 'https://i.vimeocdn.com/video/231174622-dd07f015e9221ff529d451e1cc31c982b5d87bfafa48c4189b1da72824ee289a-d','like_count': int,- 'tags': 'count:11',+ 'release_timestamp': 1324361742,+ 'release_date': '20111220',},# 'params': {'format': 'Original'},'expected_warnings': ['Failed to parse XML: not well-formed'],@@ -521,15 +527,18 @@ class VimeoIE(VimeoBaseInfoExtractor):'id': '393756517',# 'ext': 'mov','ext': 'mp4',- 'timestamp': 1582642091,+ 'timestamp': 1582660091,'uploader_id': 'frameworkla','title': 'Straight To Hell - Sabrina: Netflix','uploader': 'Framework Studio',- 'description': 'md5:f2edc61af3ea7a5592681ddbb683db73','upload_date': '20200225','duration': 176,'thumbnail': 'https://i.vimeocdn.com/video/859377297-836494a4ef775e9d4edbace83937d9ad34dc846c688c0c419c0e87f7ab06c4b3-d','uploader_url': 'https://vimeo.com/frameworkla',+ 'comment_count': int,+ 'like_count': int,+ 'release_timestamp': 1582660091,+ 'release_date': '20200225',},# 'params': {'format': 'source'},'expected_warnings': ['Failed to parse XML: not well-formed'],@@ -630,7 +639,7 @@ class VimeoIE(VimeoBaseInfoExtractor):'description': str, # FIXME: Dynamic SEO spam description'upload_date': '20150209','timestamp': 1423518307,- 'thumbnail': 'https://i.vimeocdn.com/video/default',+ 'thumbnail': r're:https://i\.vimeocdn\.com/video/default','duration': 10,'like_count': int,'uploader_url': 'https://vimeo.com/user20132939',@@ -667,6 +676,7 @@ class VimeoIE(VimeoBaseInfoExtractor):'like_count': int,'uploader_url': 'https://vimeo.com/aliniamedia','release_date': '20160329',+ 'view_count': int,},'params': {'skip_download': True},'expected_warnings': ['Failed to parse XML: not well-formed'],@@ -678,18 +688,19 @@ class VimeoIE(VimeoBaseInfoExtractor):# 'ext': 'm4v','ext': 'mp4','title': 'Eastnor Castle 2015 Firework Champions - The Promo!',- 'description': 'md5:5967e090768a831488f6e74b7821b3c1',+ 'description': 'md5:9441e6829ae94f380cc6417d982f63ac','uploader_id': 'fireworkchampions','uploader': 'Firework Champions','upload_date': '20150910',- 'timestamp': 1441901895,+ 'timestamp': 1441916295,'thumbnail': 'https://i.vimeocdn.com/video/534715882-6ff8e4660cbf2fea68282876d8d44f318825dfe572cc4016e73b3266eac8ae3a-d','uploader_url': 'https://vimeo.com/fireworkchampions',- 'tags': 'count:6','duration': 229,'view_count': int,'like_count': int,'comment_count': int,+ 'release_timestamp': 1441916295,+ 'release_date': '20150910',},'params': {'skip_download': True,@@ -820,7 +831,7 @@ class VimeoIE(VimeoBaseInfoExtractor):'uploader': 'Raja Virdi','uploader_id': 'rajavirdi','uploader_url': 'https://vimeo.com/rajavirdi',- 'duration': 309,+ 'duration': 300,'thumbnail': r're:https://i\.vimeocdn\.com/video/1716727772-[\da-f]+-d',},# 'params': {'format': 'source'},@@ -1122,7 +1133,7 @@ class VimeoOndemandIE(VimeoIE): # XXX: Do not subclass from concrete IE'description': 'md5:aeeba3dbd4d04b0fa98a4fdc9c639998','upload_date': '20140906','timestamp': 1410032453,- 'thumbnail': 'https://i.vimeocdn.com/video/488238335-d7bf151c364cff8d467f1b73784668fe60aae28a54573a35d53a1210ae283bd8-d_1280',+ 'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d','comment_count': int,'license': 'https://creativecommons.org/licenses/by-nc-nd/3.0/','duration': 53,@@ -1132,7 +1143,7 @@ class VimeoOndemandIE(VimeoIE): # XXX: Do not subclass from concrete IE'params': {'format': 'best[protocol=https]',},- 'expected_warnings': ['Unable to download JSON metadata'],+ 'expected_warnings': ['Failed to parse XML: not well-formed'],}, {# requires Referer to be passed along with og:video:url'url': 'https://vimeo.com/ondemand/36938/126682985',@@ -1149,13 +1160,14 @@ class VimeoOndemandIE(VimeoIE): # XXX: Do not subclass from concrete IE'duration': 121,'comment_count': int,'view_count': int,- 'thumbnail': 'https://i.vimeocdn.com/video/517077723-7066ae1d9a79d3eb361334fb5d58ec13c8f04b52f8dd5eadfbd6fb0bcf11f613-d_1280',+ 'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d','like_count': int,+ 'tags': 'count:5',},'params': {'skip_download': True,},- 'expected_warnings': ['Unable to download JSON metadata'],+ 'expected_warnings': ['Failed to parse XML: not well-formed'],}, {'url': 'https://vimeo.com/ondemand/nazmaalik','only_matching': True,@@ -1237,7 +1249,7 @@ class VimeoUserIE(VimeoChannelIE): # XXX: Do not subclass from concrete IE_TESTS = [{'url': 'https://vimeo.com/nkistudio/videos','info_dict': {- 'title': 'Nki',+ 'title': 'AKAMA','id': 'nkistudio',},'playlist_mincount': 66,@@ -1370,10 +1382,10 @@ class VimeoReviewIE(VimeoBaseInfoExtractor):'uploader_id': 'user170863801','uploader_url': 'https://vimeo.com/user170863801','duration': 30,- 'thumbnail': 'https://i.vimeocdn.com/video/1912612821-09a43bd2e75c203d503aed89de7534f28fc4474a48f59c51999716931a246af5-d_1280',+ 'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',},'params': {'skip_download': 'm3u8'},- 'expected_warnings': ['Failed to parse XML'],+ 'expected_warnings': ['Failed to parse XML: not well-formed'],}, {'url': 'https://vimeo.com/user21297594/review/75524534/3c257a1b5d','md5': 'c507a72f780cacc12b2248bb4006d253',@@ -1528,20 +1540,22 @@ class VimeoProIE(VimeoBaseInfoExtractor):'uploader_id': 'openstreetmapus','uploader': 'OpenStreetMap US','title': 'Andy Allan - Putting the Carto into OpenStreetMap Cartography',- 'description': 'md5:2c362968038d4499f4d79f88458590c1',+ 'description': 'md5:8cf69a1a435f2d763f4adf601e9c3125','duration': 1595,'upload_date': '20130610',- 'timestamp': 1370893156,+ 'timestamp': 1370907556,'license': 'by',- 'thumbnail': 'https://i.vimeocdn.com/video/440260469-19b0d92fca3bd84066623b53f1eb8aaa3980c6c809e2d67b6b39ab7b4a77a344-d_960',+ 'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d','view_count': int,'comment_count': int,'like_count': int,- 'tags': 'count:1',+ 'release_timestamp': 1370907556,+ 'release_date': '20130610',},'params': {'format': 'best[protocol=https]',},+ 'expected_warnings': ['Failed to parse XML: not well-formed'],}, {# password-protected VimeoPro page with Vimeo player embed'url': 'https://vimeopro.com/cadfem/simulation-conference-mechanische-systeme-in-perfektion',@@ -1549,7 +1563,7 @@ class VimeoProIE(VimeoBaseInfoExtractor):'id': '764543723','ext': 'mp4','title': 'Mechanische Systeme in Perfektion: Realität erfassen, Innovation treiben',- 'thumbnail': 'https://i.vimeocdn.com/video/1543784598-a1a750494a485e601110136b9fe11e28c2131942452b3a5d30391cb3800ca8fd-d_1280',+ 'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d','description': 'md5:2a9d195cd1b0f6f79827107dc88c2420','uploader': 'CADFEM','uploader_id': 'cadfem',@@ -1561,6 +1575,7 @@ class VimeoProIE(VimeoBaseInfoExtractor):'videopassword': 'Conference2022','skip_download': True,},+ 'expected_warnings': ['Failed to parse XML: not well-formed'],}]def _real_extract(self, url):