From d6ddb74cded42ae0cb583d3a5d00216f8acb88f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 11 Apr 2019 20:43:08 +0200 Subject: [PATCH] update test results - deviantart: 'index' is now an integer - flickr: image file with lower quality - paheal: image server name changed - rule34: post got deleted --- gallery_dl/extractor/deviantart.py | 2 +- gallery_dl/extractor/flickr.py | 2 +- gallery_dl/extractor/paheal.py | 4 ++-- gallery_dl/extractor/rule34.py | 13 +++++++------ test/test_results.py | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index b9914db4..6817a125 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -235,7 +235,7 @@ class DeviantartGalleryExtractor(DeviantartExtractor): "deviationid": str, "?download_filesize": int, "extension": str, - "index": str, + "index": int, "is_deleted": bool, "is_downloadable": bool, "is_favourited": bool, diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py index a7df86b8..7e72107d 100644 --- a/gallery_dl/extractor/flickr.py +++ b/gallery_dl/extractor/flickr.py @@ -52,7 +52,7 @@ class FlickrImageExtractor(FlickrExtractor): test = ( ("https://www.flickr.com/photos/departingyyz/16089302239", { "pattern": pattern, - "content": "6aaad7512d335ca93286fe2046e7fe3bb93d808e", + "content": "0821a28ee46386e85b02b67cf2720063440a228c", "keyword": { "extension": "jpg", "filename": "16089302239_de18cd8017_b", diff --git a/gallery_dl/extractor/paheal.py b/gallery_dl/extractor/paheal.py index 6eba8a58..bc651c5f 100644 --- a/gallery_dl/extractor/paheal.py +++ b/gallery_dl/extractor/paheal.py @@ -95,8 +95,8 @@ class PahealPostExtractor(PahealExtractor): pattern = (r"(?:https?://)?(?:rule34|rule63|cosplay)\.paheal\.net" r"/post/view/(\d+)") test = ("https://rule34.paheal.net/post/view/481609", { - "url": "3aa2189c8d1fa952a4d3420def93fd2bd54d6741", - "keyword": "99f631ebbde1324bbbedec40f0d4d6858619ba84", + "url": "1142779378f655ec0497d4c301836aa667f788b1", + "keyword": "34e9e93d4fa6fa06fac1a56e78c9a52e8cd7b271", "content": "7b924bcf150b352ac75c9d281d061e174c851a11", }) diff --git a/gallery_dl/extractor/rule34.py b/gallery_dl/extractor/rule34.py index e18e9dda..de7ef451 100644 --- a/gallery_dl/extractor/rule34.py +++ b/gallery_dl/extractor/rule34.py @@ -31,9 +31,9 @@ class Rule34TagExtractor(booru.TagMixin, Rule34Extractor): pattern = (r"(?:https?://)?(?:www\.)?rule34\.xxx/(?:index\.php)?" r"\?page=post&s=list&tags=(?P[^&#]+)") test = ("https://rule34.xxx/index.php?page=post&s=list&tags=danraku", { - "content": "a01768c6f86f32eb7ebbdeb87c30b0d9968d7f97", + "content": "97e4bbf86c3860be18de384d02d544251afe1d45", "pattern": r"https?://([^.]+\.)?rule34\.xxx/images/\d+/[0-9a-f]+\.jpg", - "count": 2, + "count": 1, }) @@ -50,13 +50,14 @@ class Rule34PostExtractor(booru.PostMixin, Rule34Extractor): """Extractor for single images from rule34.xxx""" pattern = (r"(?:https?://)?(?:www\.)?rule34\.xxx/(?:index\.php)?" r"\?page=post&s=view&id=(?P\d+)") - test = ("https://rule34.xxx/index.php?page=post&s=view&id=1974854", { - "content": "fd2820df78fb937532da0a46f7af6cefc4dc94be", + test = ("https://rule34.xxx/index.php?page=post&s=view&id=1995545", { + "content": "97e4bbf86c3860be18de384d02d544251afe1d45", "options": (("tags", True),), "keyword": { "tags_artist": "danraku", - "tags_character": "io_(pso2)", - "tags_copyright": "phantasy_star phantasy_star_online_2", + "tags_character": "kashima_(kantai_collection)", + "tags_copyright": "kantai_collection", "tags_general": str, + "tags_metadata": str, }, }) diff --git a/test/test_results.py b/test/test_results.py index 1af5b970..a7f4a414 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -20,11 +20,12 @@ from gallery_dl import extractor, job, config, exception TRAVIS_SKIP = { "exhentai", "kissmanga", "mangafox", "dynastyscans", "nijie", "bobx", "archivedmoe", "archiveofsins", "thebarchive", "fireden", "4plebs", - "sankaku", "idolcomplex", "mangahere", "readcomiconline", + "sankaku", "idolcomplex", "mangahere", "readcomiconline", "mangadex", } # temporary issues, etc. BROKEN = { + "acidimg", "mangapark", }