From 2f4f60de338b293489b52788357ec57725760d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 27 Dec 2018 22:35:02 +0100 Subject: [PATCH] [tumblr] add tests for each post type --- gallery_dl/extractor/tumblr.py | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index e11c8a09..31a8254f 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -194,17 +194,17 @@ class TumblrUserExtractor(TumblrExtractor): pattern = [BASE_PATTERN + r"(?:/page/\d+|/archive)?/?$"] test = [ ("http://demo.tumblr.com/", { - "pattern": (r"https://\d+\.media\.tumblr\.com" - r"/tumblr_[^/_]+_\d+\.jpg"), + "pattern": r"https://\d+\.media\.tumblr\.com" + r"/tumblr_[^/_]+_\d+\.jpg", "count": 1, + "options": (("posts", "photo"),), }), ("http://demo.tumblr.com/", { "pattern": (r"https?://(?:$|" r"\d+\.media\.tumblr\.com/.+_1280\.jpg|" r"w+\.tumblr\.com/audio_file/demo/\d+/tumblr_\w+)"), "count": 3, - "options": (("posts", "all"), ("external", True), - ("inline", True), ("reblogs", True)) + "options": (("posts", "all"), ("external", True)) }), ("https://demo.tumblr.com/page/2", None), ("https://demo.tumblr.com/archive", None), @@ -226,6 +226,30 @@ class TumblrPostExtractor(TumblrExtractor): r"/tumblr_[^/_]+_1280.jpg"), "count": 1, }), + ("https://mikf123.tumblr.com/post/167770226574/text-post", { + "count": 2, + }), + ("https://mikf123.tumblr.com/post/181022561719/quote-post", { + "count": 1, + }), + ("https://mikf123.tumblr.com/post/167623351559/link-post", { + "count": 2, + }), + ("https://muyanna.tumblr.com/post/180692431632/answer-post", { + "count": 1, + }), + ("https://mikf123.tumblr.com/post/167633596145/video-post", { + "count": 2, + }), + ("https://mikf123.tumblr.com/post/167770026604/audio-post", { + "count": 2, + }), + ("https://mikf123.tumblr.com/post/172687798174/photo-post", { + "count": 4, + }), + ("https://mikf123.tumblr.com/post/181022380064/chat-post", { + "count": 0, + }), ("http://demo.tumblr.com/image/459265350", None), ]