diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:06:11 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:06:11 +0000 |
commit | fd5a06560caab95c71a2e2e805efa8d0f3a696a0 (patch) | |
tree | e1c600b8612bc4b301e2f51b875fcd835c5008cc /yt_dlp/extractor/tumblr.py | |
parent | Releasing progress-linux version 2024.05.27-1~progress7.99u1. (diff) | |
download | yt-dlp-fd5a06560caab95c71a2e2e805efa8d0f3a696a0.tar.xz yt-dlp-fd5a06560caab95c71a2e2e805efa8d0f3a696a0.zip |
Merging upstream version 2024.07.01.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'yt_dlp/extractor/tumblr.py')
-rw-r--r-- | yt_dlp/extractor/tumblr.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/yt_dlp/extractor/tumblr.py b/yt_dlp/extractor/tumblr.py index f2d0c59..7f851bf 100644 --- a/yt_dlp/extractor/tumblr.py +++ b/yt_dlp/extractor/tumblr.py @@ -28,7 +28,7 @@ class TumblrIE(InfoExtractor): 'repost_count': int, 'age_limit': 0, 'tags': ['Orphan Black', 'Tatiana Maslany', 'Interview', 'Video', 'OB S1 DVD Extras'], - } + }, }, { 'note': 'multiple formats', 'url': 'https://maskofthedragon.tumblr.com/post/626907179849564160/mona-talking-in-english', @@ -65,7 +65,7 @@ class TumblrIE(InfoExtractor): 'repost_count': int, 'age_limit': 0, 'tags': [], - } + }, }, { 'note': 'dashboard only (original post)', 'url': 'https://jujanon.tumblr.com/post/159704441298/my-baby-eating', @@ -82,7 +82,7 @@ class TumblrIE(InfoExtractor): 'repost_count': int, 'age_limit': 0, 'tags': ['crabs', 'my video', 'my pets'], - } + }, }, { 'note': 'dashboard only (reblog)', 'url': 'https://bartlebyshop.tumblr.com/post/180294460076/duality-of-bird', @@ -99,7 +99,7 @@ class TumblrIE(InfoExtractor): 'repost_count': int, 'age_limit': 0, 'tags': [], - } + }, }, { 'note': 'dashboard only (external)', 'url': 'https://afloweroutofstone.tumblr.com/post/675661759168823296/the-blues-remembers-everything-the-country-forgot', @@ -149,7 +149,7 @@ class TumblrIE(InfoExtractor): 'uploader': 'naked-yogi', }, # 'add_ie': ['Vidme'], - 'skip': 'dead embedded video host' + 'skip': 'dead embedded video host', }, { 'url': 'https://prozdvoices.tumblr.com/post/673201091169681408/what-recording-voice-acting-sounds-like', 'md5': 'a0063fc8110e6c9afe44065b4ea68177', @@ -363,8 +363,8 @@ class TumblrIE(InfoExtractor): # 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 + 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') |