diff --git a/yt_dlp/extractor/tumblr.py b/yt_dlp/extractor/tumblr.py index 7f851bf63..d6d436883 100644 --- a/yt_dlp/extractor/tumblr.py +++ b/yt_dlp/extractor/tumblr.py @@ -3,12 +3,13 @@ from ..utils import ( ExtractorError, int_or_none, traverse_obj, + url_or_none, urlencode_postdata, ) class TumblrIE(InfoExtractor): - _VALID_URL = r'https?://(?P[^/?#&]+)\.tumblr\.com/(?:post|video)/(?P[0-9]+)(?:$|[/?#])' + _VALID_URL = r'https?://(?P[^/?#&]+)\.tumblr\.com/(?:post|video|(?P[a-zA-Z\d-]+))/(?P[0-9]+)(?:$|[/?#])' _NETRC_MACHINE = 'tumblr' _LOGIN_URL = 'https://www.tumblr.com/login' _OAUTH_URL = 'https://www.tumblr.com/api/v2/oauth2/token' @@ -66,6 +67,7 @@ class TumblrIE(InfoExtractor): 'age_limit': 0, 'tags': [], }, + 'skip': '404', }, { 'note': 'dashboard only (original post)', 'url': 'https://jujanon.tumblr.com/post/159704441298/my-baby-eating', @@ -98,7 +100,6 @@ class TumblrIE(InfoExtractor): 'like_count': int, 'repost_count': int, 'age_limit': 0, - 'tags': [], }, }, { 'note': 'dashboard only (external)', @@ -109,14 +110,13 @@ class TumblrIE(InfoExtractor): 'title': 'The Blues Remembers Everything the Country Forgot', 'alt_title': 'The Blues Remembers Everything the Country Forgot', 'description': 'md5:1a6b4097e451216835a24c1023707c79', - 'release_date': '20201224', 'creator': 'md5:c2239ba15430e87c3b971ba450773272', 'uploader': 'Moor Mother - Topic', 'upload_date': '20201223', 'uploader_id': 'UCxrMtFBRkFvQJ_vVM4il08w', 'uploader_url': 'http://www.youtube.com/channel/UCxrMtFBRkFvQJ_vVM4il08w', 'thumbnail': r're:^https?://i.ytimg.com/.*', - 'channel': 'Moor Mother - Topic', + 'channel': 'Moor Mother', 'channel_id': 'UCxrMtFBRkFvQJ_vVM4il08w', 'channel_url': 'https://www.youtube.com/channel/UCxrMtFBRkFvQJ_vVM4il08w', 'channel_follower_count': int, @@ -135,24 +135,10 @@ class TumblrIE(InfoExtractor): 'release_year': 2020, }, 'add_ie': ['Youtube'], - }, { - 'url': 'http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching', - 'md5': 'de07e5211d60d4f3a2c3df757ea9f6ab', - 'info_dict': { - 'id': 'Wmur', - 'ext': 'mp4', - 'title': 'naked smoking & stretching', - 'upload_date': '20150506', - 'timestamp': 1430931613, - 'age_limit': 18, - 'uploader_id': '1638622', - 'uploader': 'naked-yogi', - }, - # 'add_ie': ['Vidme'], - 'skip': 'dead embedded video host', + 'skip': 'Video Unavailable', }, { 'url': 'https://prozdvoices.tumblr.com/post/673201091169681408/what-recording-voice-acting-sounds-like', - 'md5': 'a0063fc8110e6c9afe44065b4ea68177', + 'md5': 'cb8328a6723c30556cef59e370202918', 'info_dict': { 'id': 'eomhW5MLGWA', 'ext': 'mp4', @@ -160,8 +146,8 @@ class TumblrIE(InfoExtractor): 'description': 'md5:1da3faa22d0e0b1d8b50216c284ee798', 'uploader': 'ProZD', 'upload_date': '20220112', - 'uploader_id': 'ProZD', - 'uploader_url': 'http://www.youtube.com/user/ProZD', + 'uploader_id': '@ProZD', + 'uploader_url': 'https://www.youtube.com/@ProZD', 'thumbnail': r're:^https?://i.ytimg.com/.*', 'channel': 'ProZD', 'channel_id': 'UC6MFZAOHXlKK1FI7V0XQVeA', @@ -176,6 +162,10 @@ class TumblrIE(InfoExtractor): 'live_status': 'not_live', 'playable_in_embed': True, 'availability': 'public', + 'heatmap': 'count:100', + 'channel_is_verified': True, + 'timestamp': 1642014562, + 'comment_count': int, }, 'add_ie': ['Youtube'], }, { @@ -183,16 +173,20 @@ class TumblrIE(InfoExtractor): 'md5': '203e9eb8077e3f45bfaeb4c86c1467b8', 'info_dict': { 'id': '87816359', - 'ext': 'mov', + 'ext': 'mp4', 'title': 'Harold Ramis', - 'description': 'md5:be8e68cbf56ce0785c77f0c6c6dfaf2c', + 'description': 'md5:c99882405fcca0b1d348ad093f8f1672', 'uploader': 'Resolution Productions Group', 'uploader_id': 'resolutionproductions', 'uploader_url': 'https://vimeo.com/resolutionproductions', 'upload_date': '20140227', 'thumbnail': r're:^https?://i.vimeocdn.com/video/.*', - 'timestamp': 1393523719, + 'timestamp': 1393541719, 'duration': 291, + 'comment_count': int, + 'like_count': int, + 'release_timestamp': 1393541719, + 'release_date': '20140227', }, 'add_ie': ['Vimeo'], }, { @@ -214,6 +208,7 @@ class TumblrIE(InfoExtractor): 'view_count': int, }, 'add_ie': ['Vine'], + 'skip': 'Vine is unavailable', }, { 'url': 'https://silami.tumblr.com/post/84250043974/my-bad-river-flows-in-you-impression-on-maschine', 'md5': '3c92d7c3d867f14ccbeefa2119022277', @@ -232,6 +227,140 @@ class TumblrIE(InfoExtractor): 'upload_date': '20140429', }, 'add_ie': ['Instagram'], + }, { + 'note': 'new url scheme', + 'url': 'https://www.tumblr.com/autumnsister/765162750456578048?source=share', + 'info_dict': { + 'id': '765162750456578048', + 'ext': 'mp4', + 'uploader_url': 'https://autumnsister.tumblr.com/', + 'tags': ['autumn', 'food', 'curators on tumblr'], + 'like_count': int, + 'thumbnail': 'https://64.media.tumblr.com/tumblr_sklad89N3x1ygquow_frame1.jpg', + 'title': '🪹', + 'uploader_id': 'autumnsister', + 'repost_count': int, + 'age_limit': 0, + }, + }, { + 'note': 'bandcamp album embed', + 'url': 'https://patricia-taxxon.tumblr.com/post/704473755725004800/patricia-taxxon-agnes-hilda-patricia-taxxon', + 'info_dict': { + 'id': 'agnes-hilda', + 'title': 'Agnes & Hilda', + 'description': 'The inexplicable joy of an artist. Wash paws after listening.', + 'uploader_id': 'patriciataxxon', + }, + 'playlist_count': 8, + }, { + 'note': 'bandcamp track embeds (many)', + 'url': 'https://www.tumblr.com/felixcosm/730460905855467520/if-youre-looking-for-new-music-to-write-or', + 'info_dict': { + 'id': '730460905855467520', + 'uploader_id': 'felixcosm', + 'repost_count': int, + 'tags': 'count:15', + 'description': 'md5:2eb3482a3c6987280cbefb6839068f32', + 'like_count': int, + 'age_limit': 0, + 'title': 'If you\'re looking for new music to write or imagine scenerios to: STOP. This is for you.', + 'uploader_url': 'https://felixcosm.tumblr.com/', + }, + 'playlist_count': 10, + }, { + 'note': 'soundcloud track embed', + 'url': 'https://silverfoxstole.tumblr.com/post/765305403763556352/jamie-robertson-doctor-who-8th-doctor', + 'info_dict': { + 'id': '1218136399', + 'ext': 'opus', + 'comment_count': int, + 'genres': [], + 'repost_count': int, + 'uploader': 'Jamie Robertson', + 'title': 'Doctor Who - 8th doctor - Stranded Theme never released and used.', + 'duration': 46.106, + 'uploader_id': '2731064', + 'thumbnail': 'https://i1.sndcdn.com/artworks-MVgcPm5jN42isC5M-6Dz22w-original.jpg', + 'timestamp': 1645181261, + 'uploader_url': 'https://soundcloud.com/jamierobertson', + 'view_count': int, + 'upload_date': '20220218', + 'description': 'md5:ab924dd9994d0a7d64d6d31bf2af4625', + 'license': 'all-rights-reserved', + 'like_count': int, + }, + }, { + 'note': 'soundcloud set embed', + 'url': 'https://www.tumblr.com/beyourselfchulanmaria/703505323122638848/chu-lan-maria-the-playlist-%E5%BF%83%E7%9A%84%E5%91%BC%E5%96%9A-call-of-the', + 'info_dict': { + 'id': '691222680', + 'title': '心的呼喚 Call of the heart I', + 'description': 'md5:25952a8d178a3aa55e40fcbb646a38c3', + }, + 'playlist_mincount': 19, + }, { + 'note': 'dailymotion video embed', + 'url': 'https://www.tumblr.com/funvibecentral/759390024460632064', + 'info_dict': { + 'id': 'x94cnnk', + 'ext': 'mp4', + 'description': 'Funny dailymotion shorts.\n#funny #fun#comedy #romantic #exciting', + 'uploader': 'FunVibe Central', + 'like_count': int, + 'view_count': int, + 'timestamp': 1724210553, + 'title': 'Woman watching other Woman', + 'tags': [], + 'upload_date': '20240821', + 'age_limit': 0, + 'uploader_id': 'x32m6ye', + 'duration': 20, + 'thumbnail': r're:https://(?:s[12]\.)dmcdn\.net/v/Wtqh01cnxKNXLG1N8/x1080', + }, + }, { + 'note': 'tiktok video embed', + 'url': 'https://fansofcolor.tumblr.com/post/660637918605475840/blockquote-class-tiktok-embed', + 'info_dict': { + 'id': '7000937272010935558', + 'ext': 'mp4', + 'artists': ['Alicia Dreaming'], + 'like_count': int, + 'repost_count': int, + 'thumbnail': r're:^https?://[\w\/\.\-]+(~[\w\-]+\.image)?', + 'channel_id': 'MS4wLjABAAAAsJohwz_dU4KfAOc61cbGDAZ46-5hg2ANTXVQlRe1ipDhpX08PywR3PPiple1NTAo', + 'uploader': 'aliciadreaming', + 'description': 'huge casting news Greyworm will be #louisdulac #racebending #interviewwiththevampire', + 'title': 'huge casting news Greyworm will be #louisdulac #racebending #interviewwiththevampire', + 'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAsJohwz_dU4KfAOc61cbGDAZ46-5hg2ANTXVQlRe1ipDhpX08PywR3PPiple1NTAo', + 'uploader_id': '7000478462196990982', + 'uploader_url': 'https://www.tiktok.com/@aliciadreaming', + 'timestamp': 1630032733, + 'channel': 'Alicia Dreaming', + 'track': 'original sound', + 'upload_date': '20210827', + 'view_count': int, + 'comment_count': int, + 'duration': 59, + }, + }, { + 'note': 'tumblr video AND youtube embed', + 'url': 'https://www.tumblr.com/anyaboz/765332564457209856/my-music-video-for-selkie-by-nobodys-wolf-child', + 'info_dict': { + 'id': '765332564457209856', + 'uploader_id': 'anyaboz', + 'repost_count': int, + 'age_limit': 0, + 'uploader_url': 'https://anyaboz.tumblr.com/', + 'description': 'md5:9a129cf6ce9d87a80ffd3c6dedd4d1e6', + 'like_count': int, + 'title': 'md5:b18a2ac9387681d20303e485db85c1b5', + 'tags': ['music video', 'nobodys wolf child', 'selkie', 'Stop Motion Animation', 'stop Motion', 'room guardians', 'Youtube'], + }, + 'playlist_count': 2, + }, { + # twitch_live provider - error when linked account is not live + 'url': 'https://www.tumblr.com/anarcho-skamunist/722224493650722816/hollow-knight-stream-right-now-going-to-fight', + 'only_matching': True, }] _providers = { @@ -239,6 +368,16 @@ class TumblrIE(InfoExtractor): 'vimeo': 'Vimeo', 'vine': 'Vine', 'youtube': 'Youtube', + 'dailymotion': 'Dailymotion', + 'tiktok': 'TikTok', + 'twitch_live': 'TwitchStream', + 'bandcamp': None, + 'soundcloud': None, + } + # known not to be supported + _unsupported_providers = { + # seems like podcasts can't be embedded + 'spotify', } _ACCESS_TOKEN = None @@ -256,23 +395,40 @@ class TumblrIE(InfoExtractor): if not self._ACCESS_TOKEN: return - self._download_json( - self._OAUTH_URL, None, 'Logging in', - data=urlencode_postdata({ - 'password': password, - 'grant_type': 'password', - 'username': username, - }), headers={ - 'Content-Type': 'application/x-www-form-urlencoded', - 'Authorization': f'Bearer {self._ACCESS_TOKEN}', - }, - errnote='Login failed', fatal=False) + data = { + 'password': password, + 'grant_type': 'password', + 'username': username, + } + if self.get_param('twofactor'): + data['tfa_token'] = self.get_param('twofactor') + + def _call_login(): + return self._download_json( + self._OAUTH_URL, None, 'Logging in', + data=urlencode_postdata(data), + headers={ + 'Content-Type': 'application/x-www-form-urlencoded', + 'Authorization': f'Bearer {self._ACCESS_TOKEN}', + }, + errnote='Login failed', fatal=False, + expected_status=lambda s: 400 <= s < 500) + + response = _call_login() + if traverse_obj(response, 'error') == 'tfa_required': + data['tfa_token'] = self._get_tfa_info() + response = _call_login() + if traverse_obj(response, 'error'): + raise ExtractorError( + f'API returned error {": ".join(traverse_obj(response, (("error", "error_description"), {str})))}') def _real_extract(self, url): - blog, video_id = self._match_valid_url(url).groups() + blog_1, blog_2, video_id = self._match_valid_url(url).groups() + blog = blog_2 or blog_1 - url = f'http://{blog}.tumblr.com/post/{video_id}/' - webpage, urlh = self._download_webpage_handle(url, video_id) + url = f'http://{blog}.tumblr.com/post/{video_id}' + webpage, urlh = self._download_webpage_handle( + url, video_id, headers={'User-Agent': 'WhatsApp/2.0'}) # whatsapp ua bypasses problems redirect_url = urlh.url @@ -289,23 +445,69 @@ class TumblrIE(InfoExtractor): self._download_json( f'https://www.tumblr.com/api/v2/blog/{blog}/posts/{video_id}/permalink', video_id, headers={'Authorization': f'Bearer {self._ACCESS_TOKEN}'}, fatal=False), - ('response', 'timeline', 'elements', 0)) or {} - content_json = traverse_obj(post_json, ('trail', 0, 'content'), ('content')) or [] - video_json = next( - (item for item in content_json if item.get('type') == 'video'), {}) - media_json = video_json.get('media') or {} - if api_only and not media_json.get('url') and not video_json.get('url'): - raise ExtractorError('Failed to find video data for dashboard-only post') + ('response', 'timeline', 'elements', 0, {dict})) or {} + content_json = traverse_obj(post_json, ((('trail', 0), None), 'content', ..., {dict})) - if not media_json.get('url') and video_json.get('url'): - # external video host - return self.url_result( - video_json['url'], - self._providers.get(video_json.get('provider'), 'Generic')) + # the url we're extracting from might be an original post or it might be a reblog. + # if it's a reblog, og:description will be the reblogger's comment, not the uploader's. + # content_json is always the op, so if it exists but has no text, there's no description + if content_json: + description = '\n\n'.join( + item.get('text') for item in content_json if item.get('type') == 'text') or None + else: + description = self._og_search_description(webpage, default=None) + uploader_id = traverse_obj(post_json, 'reblogged_root_name', 'blog_name') - video_url = self._og_search_video_url(webpage, default=None) - duration = None + info_dict = { + 'id': video_id, + 'title': post_json.get('summary') or (blog if api_only else self._html_search_regex( + r'(?s)(?P<title>.*?)(?: \| Tumblr)?', webpage, 'title', default=blog)), + 'description': description, + 'uploader_id': uploader_id, + 'uploader_url': f'https://{uploader_id}.tumblr.com/' if uploader_id else None, + **traverse_obj(post_json, { + 'like_count': ('like_count', {int_or_none}), + 'repost_count': ('reblog_count', {int_or_none}), + 'tags': ('tags', ..., {str}), + }), + 'age_limit': {True: 18, False: 0}.get(post_json.get('is_nsfw')), + } + + # for tumblr's own video hosting + fallback_format = None formats = [] + video_url = self._og_search_video_url(webpage, default=None) + # for external video hosts + entries = [] + ignored_providers = set() + unknown_providers = set() + + for video_json in traverse_obj(content_json, lambda _, v: v['type'] in ('video', 'audio')): + media_json = video_json.get('media') or {} + if api_only and not media_json.get('url') and not video_json.get('url'): + raise ExtractorError('Failed to find video data for dashboard-only post') + provider = video_json.get('provider') + + if provider in ('tumblr', None): + fallback_format = { + 'url': media_json.get('url') or video_url, + 'width': int_or_none( + media_json.get('width') or self._og_search_property('video:width', webpage, default=None)), + 'height': int_or_none( + media_json.get('height') or self._og_search_property('video:height', webpage, default=None)), + } + continue + elif provider in self._unsupported_providers: + ignored_providers.add(provider) + continue + elif provider and provider not in self._providers: + unknown_providers.add(provider) + if video_json.get('url'): + # external video host + entries.append(self.url_result( + video_json['url'], self._providers.get(provider))) + + duration = None # iframes can supply duration and sometimes additional formats, so check for one iframe_url = self._search_regex( @@ -344,44 +546,36 @@ class TumblrIE(InfoExtractor): 'quality': quality, } for quality, (video_url, format_id) in enumerate(sources)] - if not media_json.get('url') and not video_url and not iframe_url: - # external video host (but we weren't able to figure it out from the api) - iframe_url = self._search_regex( - r'src=["\'](https?://safe\.txmblr\.com/svc/embed/inline/[^"\']+)["\']', - webpage, 'embed iframe url', default=None) - return self.url_result(iframe_url or redirect_url, 'Generic') + if not formats and fallback_format: + formats.append(fallback_format) - formats = formats or [{ - 'url': media_json.get('url') or video_url, - 'width': int_or_none( - media_json.get('width') or self._og_search_property('video:width', webpage, default=None)), - 'height': int_or_none( - media_json.get('height') or self._og_search_property('video:height', webpage, default=None)), - }] + if formats: + # tumblr's own video is always above embeds + entries.insert(0, { + **info_dict, + 'formats': formats, + 'duration': duration, + 'thumbnail': (traverse_obj(video_json, ('poster', 0, 'url', {url_or_none})) + or self._og_search_thumbnail(webpage, default=None)), + }) - # the url we're extracting from might be an original post or it might be a reblog. - # if it's a reblog, og:description will be the reblogger's comment, not the uploader's. - # content_json is always the op, so if it exists but has no text, there's no description - if content_json: - description = '\n\n'.join( - item.get('text') for item in content_json if item.get('type') == 'text') or None - else: - description = self._og_search_description(webpage, default=None) - uploader_id = traverse_obj(post_json, 'reblogged_root_name', 'blog_name') + if ignored_providers: + if not entries: + raise ExtractorError(f'None of embed providers are supported: {", ".join(ignored_providers)!s}', video_id=video_id, expected=True) + else: + self.report_warning(f'Skipped embeds from unsupported providers: {", ".join(ignored_providers)!s}', video_id) + if unknown_providers: + self.report_warning(f'Unrecognized providers, please report: {", ".join(unknown_providers)!s}', video_id) + if not entries: + self.raise_no_formats('No video could be found in this post', expected=True, video_id=video_id) + if len(entries) == 1: + return { + **info_dict, + **entries[0], + } return { - 'id': video_id, - 'title': post_json.get('summary') or (blog if api_only else self._html_search_regex( - r'(?s)(?P<title>.*?)(?: \| Tumblr)?', webpage, 'title')), - 'description': description, - 'thumbnail': (traverse_obj(video_json, ('poster', 0, 'url')) - or self._og_search_thumbnail(webpage, default=None)), - 'uploader_id': uploader_id, - 'uploader_url': f'https://{uploader_id}.tumblr.com/' if uploader_id else None, - 'duration': duration, - 'like_count': post_json.get('like_count'), - 'repost_count': post_json.get('reblog_count'), - 'age_limit': {True: 18, False: 0}.get(post_json.get('is_nsfw')), - 'tags': post_json.get('tags'), - 'formats': formats, + **info_dict, + '_type': 'playlist', + 'entries': entries, }