From 68466a7d615814e9a13a03b6737248b21fd43750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 11 Oct 2022 21:09:24 +0200 Subject: [PATCH] [tumblr] support 'https://www.tumblr.com/BLOGNAME' URLs (#3034) --- gallery_dl/extractor/tumblr.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index 5ad8122a..324a3c6e 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -17,7 +17,7 @@ import re BASE_PATTERN = ( r"(?:tumblr:(?:https?://)?([^/]+)|" r"(?:https?://)?" - r"(?:www\.tumblr\.com/blog/(?:view/)?([\w-]+)|" + r"(?:www\.tumblr\.com/(?:blog/(?:view/)?)?([\w-]+)|" r"([\w-]+\.tumblr\.com)))" ) @@ -298,6 +298,7 @@ class TumblrUserExtractor(TumblrExtractor): ("tumblr:www.b-authentique.com"), ("https://www.tumblr.com/blog/view/smarties-art"), ("https://www.tumblr.com/blog/smarties-art"), + ("https://www.tumblr.com/smarties-art"), ) def posts(self): @@ -354,6 +355,8 @@ class TumblrPostExtractor(TumblrExtractor): }), ("http://demo.tumblr.com/image/459265350"), ("https://www.tumblr.com/blog/view/smarties-art/686047436641353728"), + ("https://www.tumblr.com/blog/smarties-art/686047436641353728"), + ("https://www.tumblr.com/smarties-art/686047436641353728"), ) def __init__(self, match): @@ -381,6 +384,8 @@ class TumblrTagExtractor(TumblrExtractor): "count": 1, }), ("https://www.tumblr.com/blog/view/smarties-art/tagged/undertale"), + ("https://www.tumblr.com/blog/smarties-art/tagged/undertale"), + ("https://www.tumblr.com/smarties-art/tagged/undertale"), ) def __init__(self, match): @@ -402,6 +407,8 @@ class TumblrLikesExtractor(TumblrExtractor): "count": 1, }), ("https://www.tumblr.com/blog/view/mikf123/likes"), + ("https://www.tumblr.com/blog/mikf123/likes"), + ("https://www.tumblr.com/mikf123/likes"), ) def posts(self):