update booru testdata

gallery_dl/extractor/3dbooru.py

@@ -23,9 +23,9 @@ class ThreeDeeBooruTagExtractor(ThreeDeeBooruExtractor, booru.BooruTagExtractor)
     """Extract images from 3dbooru based on search-tags"""
     subcategory = "tag"
     pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org/post(?:/(?:index)?)?\?tags=([^&]+)"]
-    test = [("http://behoimi.org/post/index?tags=himekawa_azuru", {
-        "url": "6f6f485fb92629bc22a5df18b7cbb3ac13ae46b2",
-        "keyword": "df2f7b1fb0efb739eed55788de700a1b834d2896",
+    test = [("http://behoimi.org/post?tags=himekawa_azuru dress", {
+        "url": "ecb30c6aaaf8a6ff8f55255737a9840832a483c1",
+        "content": "11cbda40c287e026c1ce4ca430810f761f2d0b2a",
     })]
 
 class ThreeDeeBooruPoolExtractor(ThreeDeeBooruExtractor, booru.BooruPoolExtractor):
@@ -34,7 +34,7 @@ class ThreeDeeBooruPoolExtractor(ThreeDeeBooruExtractor, booru.BooruPoolExtracto
     pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org/pool/show/(\d+)"]
     test = [("http://behoimi.org/pool/show/27", {
         "url": "da75d2d1475449d5ef0c266cb612683b110a30f2",
-        "keyword": "ea76fd6cef4430bee403d080bf173af829a4390a",
+        "content": "fd5b37c5c6c2de4b4d6f1facffdefa1e28176554",
     })]
 
 class ThreeDeeBooruPostExtractor(ThreeDeeBooruExtractor, booru.BooruPostExtractor):
@@ -43,5 +43,5 @@ class ThreeDeeBooruPostExtractor(ThreeDeeBooruExtractor, booru.BooruPostExtracto
     pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org/post/show/(\d+)"]
     test = [("http://behoimi.org/post/show/140852", {
         "url": "ce874ea26f01d6c94795f3cc3aaaaa9bc325f2f6",
-        "keyword": "ebde54ed04e1de7d1fd819728963f754b77a693e",
+        "content": "26549d55b82aa9a6c1686b96af8bfcfa50805cd4",
     })]

gallery_dl/extractor/danbooru.py

@@ -18,9 +18,11 @@ class DanbooruExtractor(booru.JSONBooruExtractor):
 class DanbooruTagExtractor(DanbooruExtractor, booru.BooruTagExtractor):
     """Extract images from danbooru based on search-tags"""
     subcategory = "tag"
-    pattern = [r"(?:https?://)?(?:www\.)?danbooru.donmai.us/posts\?(?:utf8=%E2%9C%93&)?tags=([^&]+)"]
-    test = [("https://danbooru.donmai.us/posts?tags=heath_ledger", {
-        "url": "a261c33f117c7395f0eac54091075e67c8e66fca",
+    pattern = [(r"(?:https?://)?(?:www\.)?danbooru.donmai.us/posts"
+                r"\?(?:utf8=%E2%9C%93&)?tags=([^&]+)")]
+    test = [("https://danbooru.donmai.us/posts?tags=bonocho", {
+        "url": "f05b24cfd01a98eab6e8a4501885e3c29928738c",
+        "content": "b196fb9f1668109d7774a0a82efea3ffdda07746",
     })]
 
 class DanbooruPoolExtractor(DanbooruExtractor, booru.BooruPoolExtractor):
@@ -29,14 +31,14 @@ class DanbooruPoolExtractor(DanbooruExtractor, booru.BooruPoolExtractor):
     pattern = [r"(?:https?://)?(?:www\.)?danbooru.donmai.us/pools/(\d+)"]
     test = [("https://danbooru.donmai.us/pools/7659", {
         "url": "db522c7f74d42ec1940fb23d1a58ed8edb65f9ae",
-        "keyword": "bf8256e88ac0d032808e9f5aa165c9a1fa7e451c",
+        "content": "b16bab12bea5f7ea9e0a836bf8045f280e113d99",
     })]
 
 class DanbooruPostExtractor(DanbooruExtractor, booru.BooruPostExtractor):
     """Extract single images from danbooru"""
     subcategory = "post"
     pattern = [r"(?:https?://)?(?:www\.)?danbooru.donmai.us/posts/(\d+)"]
-    test = [("https://danbooru.donmai.us/posts/1534703", {
-        "url": "3a87a761dad69dfa038499aeacef679a3912816b",
-        "keyword": "0a2f4dd6b8384fcbc805302040234536895a2dc3",
+    test = [("https://danbooru.donmai.us/posts/294929", {
+        "url": "98fb9f9dc48ef5794891c6725f3610efaf6042c1",
+        "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
     })]

gallery_dl/extractor/e621.py

@@ -24,7 +24,7 @@ class E621TagExtractor(E621Extractor, booru.BooruTagExtractor):
     ]
     test = [("https://e621.net/post/index/1/anry", {
         "url": "8021e5ea28d47c474c1ffc9bd44863c4d45700ba",
-        "keyword": "573152cda6e193f57c9042fcfc561c45865ef0c2",
+        "content": "501d1e5d922da20ee8ff9806f5ed3ce3a684fd58",
     })]
 
 class E621PoolExtractor(E621Extractor, booru.BooruPoolExtractor):
@@ -33,7 +33,7 @@ class E621PoolExtractor(E621Extractor, booru.BooruPoolExtractor):
     pattern = [r"(?:https?://)?(?:www\.)?e621\.net/pool/show/(\d+)"]
     test = [("https://e621.net/pool/show/73", {
         "url": "842f2fb065c7c339486a9b1d689020b8569888ed",
-        "keyword": "c0c7cc1e7721607dc6a94e052664c14985b1d404",
+        "content": "c2c87b7a9150509496cddc75ccab08109922876a",
     })]
 
 class E621PostExtractor(E621Extractor, booru.BooruPostExtractor):
@@ -42,5 +42,5 @@ class E621PostExtractor(E621Extractor, booru.BooruPostExtractor):
     pattern = [r"(?:https?://)?(?:www\.)?e621\.net/post/show/(\d+)"]
     test = [("https://e621.net/post/show/535", {
         "url": "f7f78b44c9b88f8f09caac080adc8d6d9fdaa529",
-        "keyword": "f2309ce2bf1f7fb9403756a2789f71738ca71231",
+        "content": "66f46e96a893fba8e694c4e049b23c2acc9af462",
     })]

gallery_dl/extractor/gelbooru.py

@@ -32,7 +32,11 @@ class GelbooruExtractor(booru.XMLBooruExtractor):
 class GelbooruTagExtractor(GelbooruExtractor, booru.BooruTagExtractor):
     """Extract images from gelbooru based on search-tags"""
     subcategory = "tag"
-    pattern = [r"(?:https?://)?(?:www\.)?gelbooru\.com/(?:index\.php)?\?page=post&s=list&tags=([^&]+)"]
+    pattern = [(r"(?:https?://)?(?:www\.)?gelbooru\.com/(?:index\.php)?"
+                r"\?page=post&s=list&tags=([^&]+)")]
+    test = [("http://gelbooru.com/index.php?page=post&s=list&tags=bonocho", {
+        "content": "b196fb9f1668109d7774a0a82efea3ffdda07746",
+    })]
 
 # TODO: find out how to access pools via gelbooru-api
 # class GelbooruPoolExtractor(GelbooruExtractor, booru.BooruPoolExtractor):
@@ -43,7 +47,8 @@ class GelbooruTagExtractor(GelbooruExtractor, booru.BooruTagExtractor):
 class GelbooruPostExtractor(GelbooruExtractor, booru.BooruPostExtractor):
     """Extract single images from gelbooru"""
     subcategory = "post"
-    pattern = [r"(?:https?://)?(?:www\.)?gelbooru\.com/(?:index\.php)?\?page=post&s=view&id=(\d+)"]
+    pattern = [(r"(?:https?://)?(?:www\.)?gelbooru\.com/(?:index\.php)?"
+                r"\?page=post&s=view&id=(\d+)")]
     test = [("http://gelbooru.com/index.php?page=post&s=view&id=313638", {
-        "url": "9154c1edad734f0bacd2445c5b7540804b59f2ef",
+        "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
     })]

gallery_dl/extractor/konachan.py

@@ -19,25 +19,22 @@ class KonachanTagExtractor(KonachanExtractor, booru.BooruTagExtractor):
     """Extract images from konachan based on search-tags"""
     subcategory = "tag"
     pattern = [r"(?:https?://)?(?:www\.)?konachan\.com/post\?tags=([^&]+)"]
-    test = [("http://konachan.com/post?tags=batman_(series)", {
-        "url": "3bc7d258f74854002028ae861f2977835a022454",
-        "keyword": "e5c5767a0d3968be5465b1d00817467bf9fac1b1",
+    test = [("http://konachan.com/post?tags=patata", {
+        "content": "838cfb815e31f48160855435655ddf7bfc4ecb8d",
     })]
 
 class KonachanPoolExtractor(KonachanExtractor, booru.BooruPoolExtractor):
     """Extract image-pools from konachan"""
     subcategory = "pool"
     pattern = [r"(?:https?://)?(?:www\.)?konachan\.com/pool/show/(\d+)"]
-    test = [("http://konachan.com/pool/show/5", {
-        "url": "27f0b7bc60bb8961612005b53c8d46cf76272003",
-        "keyword": "9d1eba1c4adbf751f4b5dac2f79eb4dbec1ca577",
+    test = [("http://konachan.com/pool/show/95", {
+        "content": "cf0546e38a93c2c510a478f8744e60687b7a8426",
     })]
 
 class KonachanPostExtractor(KonachanExtractor, booru.BooruPostExtractor):
     """Extract single images from konachan"""
     subcategory = "post"
     pattern = [r"(?:https?://)?(?:www\.)?konachan\.com/post/show/(\d+)"]
-    test = [("http://konachan.com/post/show/141341", {
-        "url": "3bc7d258f74854002028ae861f2977835a022454",
-        "keyword": "df1ce9be720e335f68eca1a53d3df6cf727b6372",
+    test = [("http://konachan.com/post/show/205189", {
+        "content": "674e75a753df82f5ad80803f575818b8e46e4b65",
     })]

gallery_dl/extractor/safebooru.py

@@ -29,9 +29,9 @@ class SafebooruTagExtractor(SafebooruExtractor, booru.BooruTagExtractor):
     """Extract images from safebooru based on search-tags"""
     subcategory = "tag"
     pattern = [r"(?:https?://)?(?:www\.)?safebooru\.org/(?:index\.php)?\?page=post&s=list&tags=([^&]+)"]
-    test = [("http://safebooru.org/index.php?page=post&s=list&tags=heath_ledger", {
-        "url": "72f17ad6f8254595b56f7e5dd1947d8b51b1ba9b",
-        "keyword": "79670e1de47e39352fe71f482ece003cdf8e4512",
+    test = [("http://safebooru.org/index.php?page=post&s=list&tags=bonocho", {
+        "url": "c91e04ffbdf317fae95b2e160c8345503d9fb730",
+        "content": "e5ad4c5bf241b1def154958535bef6c2f6b733eb",
     })]
 
 class SafebooruPostExtractor(SafebooruExtractor, booru.BooruPostExtractor):

gallery_dl/extractor/yandere.py

@@ -19,21 +19,22 @@ class YandereTagExtractor(YandereExtractor, booru.BooruTagExtractor):
     """Extract images from yandere based on search-tags"""
     subcategory = "tag"
     pattern = [r"(?:https?://)?(?:www\.)?yande\.re/post\?tags=([^&]+)"]
+    test = [("https://yande.re/post?tags=ouzoku armor", {
+        "content": "59201811c728096b2d95ce6896fd0009235fe683",
+    })]
 
 class YanderePoolExtractor(YandereExtractor, booru.BooruPoolExtractor):
     """Extract image-pools from yandere"""
     subcategory = "pool"
     pattern = [r"(?:https?://)?(?:www\.)?yande.re/pool/show/(\d+)"]
-    test = [("https://yande.re/pool/show/12", {
-        "url": "07f32d2b70c3dc6b014597a49b9fa4e8c274989f",
-        "keyword": "963e9dacc8f4dd5f0bc46f2f187e94b71e35d950",
+    test = [("https://yande.re/pool/show/318", {
+        "content": "2a35b9d6edecce11cc2918c6dce4de2198342b68",
     })]
 
 class YanderePostExtractor(YandereExtractor, booru.BooruPostExtractor):
     """Extract single images from yandere"""
     subcategory = "post"
     pattern = [r"(?:https?://)?(?:www\.)?yande.re/post/show/(\d+)"]
-    test = [("https://yande.re/post/show/298952", {
-        "url": "ce0c3c29ee968b45db4e4ed5ad3fe8e7ecfb2e33",
-        "keyword": "ddc1f3c071f4e87e80394982d35f384a12119ca6",
+    test = [("https://yande.re/post/show/51824", {
+        "content": "59201811c728096b2d95ce6896fd0009235fe683",
     })]