From 393755ee94ef81e951ed5a060189e1ee392ca75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 8 Oct 2017 23:59:27 +0200 Subject: [PATCH] [tumblr] update tests --- gallery_dl/extractor/flickr.py | 2 +- gallery_dl/extractor/tumblr.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py index 427d3432..3403e3c4 100644 --- a/gallery_dl/extractor/flickr.py +++ b/gallery_dl/extractor/flickr.py @@ -172,7 +172,7 @@ class FlickrGroupExtractor(FlickrExtractor): directory_fmt = ["{category}", "{subcategory}s", "{group[groupname]}"] pattern = [r"(?:https?://)?(?:www\.)?flickr\.com/groups/([^/]+)"] test = [("https://www.flickr.com/groups/bird_headshots/", { - "url": "5380ceef1a00eec6dd7b9dfe3cc96283f6aaea09", + "url": "1ac6b088abdc723ec17e951a1f77d8923620737a", })] def data(self): diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index 0ff9c794..c1206107 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -21,8 +21,9 @@ class TumblrUserExtractor(Extractor): filename_fmt = "{category}_{user}_{id}{offset}.{extension}" pattern = [r"(?:https?://)?([^.]+)\.tumblr\.com(?:/page/\d+)?/?$"] test = [("http://demo.tumblr.com/", { - "url": "5c113da25a605b7449de8ca1606eec5502b4dc9f", "keyword": "8f1b06c2a0a562b10df3e62ab2a8156e3da1855b", + "pattern": "https://\d+\.media\.tumblr\.com/tumblr_[^/_]+_1280.jpg", + "count": 1, })] def __init__(self, match): @@ -101,8 +102,9 @@ class TumblrPostExtractor(TumblrUserExtractor): subcategory = "post" pattern = [r"(?:https?://)?([^.]+)\.tumblr\.com/post/(\d+)"] test = [("http://demo.tumblr.com/post/459265350", { - "url": "5c113da25a605b7449de8ca1606eec5502b4dc9f", "keyword": "4d5bc44bf8ec334fdaf78696edf215574fa6d998", + "pattern": "https://\d+\.media\.tumblr\.com/tumblr_[^/_]+_1280.jpg", + "count": 1, })] def __init__(self, match): @@ -115,8 +117,9 @@ class TumblrTagExtractor(TumblrUserExtractor): subcategory = "tag" pattern = [r"(?:https?://)?([^.]+)\.tumblr\.com/tagged/(.+)"] test = [("http://demo.tumblr.com/tagged/Times Square", { - "url": "5c113da25a605b7449de8ca1606eec5502b4dc9f", "keyword": "b0465d131ecb097633127b79805432dacae06d14", + "pattern": "https://\d+\.media\.tumblr\.com/tumblr_[^/_]+_1280.jpg", + "count": 1, })] def __init__(self, match):