From d38bf2f54c4cf70e731fb2e517d6c4605302932a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 8 Feb 2018 21:20:19 +0100 Subject: [PATCH] [tumblr] recognize /image/... URLs xyz.tumblr.com/image/123 refers to the same images as xyz.tumblr.com/post/123. --- gallery_dl/extractor/tumblr.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index 96056911..d02cde9e 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -183,12 +183,15 @@ class TumblrUserExtractor(TumblrExtractor): class TumblrPostExtractor(TumblrExtractor): """Extractor for images from a single post on tumblr""" subcategory = "post" - pattern = [BASE_PATTERN + r"/post/(\d+)"] - test = [("http://demo.tumblr.com/post/459265350", { - "pattern": (r"https://s3\.amazonaws\.com/data\.tumblr\.com" - r"/tumblr_[^/_]+_1280.jpg"), - "count": 1, - })] + pattern = [BASE_PATTERN + r"/(?:post|image)/(\d+)"] + test = [ + ("http://demo.tumblr.com/post/459265350", { + "pattern": (r"https://s3\.amazonaws\.com/data\.tumblr\.com" + r"/tumblr_[^/_]+_1280.jpg"), + "count": 1, + }), + ("http://demo.tumblr.com/image/459265350", None), + ] def __init__(self, match): TumblrExtractor.__init__(self, match)