New upstream version 1.26.0.upstream/1.26.0

1 files changed, 9 insertions, 111 deletions

diff --git a/gallery_dl/extractor/e621.py b/gallery_dl/extractor/e621.py
index d4f6cd4..af963bc 100644
--- a/gallery_dl/extractor/e621.py
+++ b/gallery_dl/extractor/e621.py
@@ -74,45 +74,23 @@ BASE_PATTERN = E621Extractor.update({
         "root": "https://e926.net",
         "pattern": r"e926\.net",
     },
+    "e6ai": {
+        "root": "https://e6ai.net",
+        "pattern": r"e6ai\.net",
+    },
 })
 
 
 class E621TagExtractor(E621Extractor, danbooru.DanbooruTagExtractor):
     """Extractor for e621 posts from tag searches"""
     pattern = BASE_PATTERN + r"/posts?(?:\?.*?tags=|/index/\d+/)([^&#]+)"
-    test = (
-        ("https://e621.net/posts?tags=anry", {
-            "url": "8021e5ea28d47c474c1ffc9bd44863c4d45700ba",
-            "content": "501d1e5d922da20ee8ff9806f5ed3ce3a684fd58",
-        }),
-        ("https://e621.net/post/index/1/anry"),
-        ("https://e621.net/post?tags=anry"),
-
-        ("https://e926.net/posts?tags=anry", {
-            "url": "12198b275c62ffe2de67cca676c8e64de80c425d",
-            "content": "501d1e5d922da20ee8ff9806f5ed3ce3a684fd58",
-        }),
-        ("https://e926.net/post/index/1/anry"),
-        ("https://e926.net/post?tags=anry"),
-    )
+    example = "https://e621.net/posts?tags=TAG"
 
 
 class E621PoolExtractor(E621Extractor, danbooru.DanbooruPoolExtractor):
     """Extractor for e621 pools"""
     pattern = BASE_PATTERN + r"/pool(?:s|/show)/(\d+)"
-    test = (
-        ("https://e621.net/pools/73", {
-            "url": "1bd09a72715286a79eea3b7f09f51b3493eb579a",
-            "content": "91abe5d5334425d9787811d7f06d34c77974cd22",
-        }),
-        ("https://e621.net/pool/show/73"),
-
-        ("https://e926.net/pools/73", {
-            "url": "6936f1b6a18c5c25bee7cad700088dbc2503481b",
-            "content": "91abe5d5334425d9787811d7f06d34c77974cd22",
-        }),
-        ("https://e926.net/pool/show/73"),
-    )
+    example = "https://e621.net/pools/12345"
 
     def posts(self):
         self.log.info("Fetching posts of pool %s", self.pool_id)
@@ -138,61 +116,7 @@ class E621PoolExtractor(E621Extractor, danbooru.DanbooruPoolExtractor):
 class E621PostExtractor(E621Extractor, danbooru.DanbooruPostExtractor):
     """Extractor for single e621 posts"""
     pattern = BASE_PATTERN + r"/post(?:s|/show)/(\d+)"
-    test = (
-        ("https://e621.net/posts/535", {
-            "url": "f7f78b44c9b88f8f09caac080adc8d6d9fdaa529",
-            "content": "66f46e96a893fba8e694c4e049b23c2acc9af462",
-            "keyword": {"date": "dt:2007-02-17 19:02:32"},
-        }),
-        ("https://e621.net/posts/3181052", {
-            "options": (("metadata", "notes,pools"),),
-            "pattern": r"https://static\d\.e621\.net/data/c6/8c"
-                       r"/c68cca0643890b615f75fb2719589bff\.png",
-            "keyword": {
-                "notes": [
-                    {
-                        "body": "Little Legends 2",
-                        "created_at": "2022-05-16T13:58:38.877-04:00",
-                        "creator_id": 517450,
-                        "creator_name": "EeveeCuddler69",
-                        "height": 475,
-                        "id": 321296,
-                        "is_active": True,
-                        "post_id": 3181052,
-                        "updated_at": "2022-05-16T13:59:02.050-04:00",
-                        "version": 3,
-                        "width": 809,
-                        "x": 83,
-                        "y": 117,
-                    },
-                ],
-                "pools": [
-                    {
-                        "category": "series",
-                        "created_at": "2022-02-17T00:29:22.669-05:00",
-                        "creator_id": 1077440,
-                        "creator_name": "Yeetus90",
-                        "description": "* \"Little Legends\":/pools/27971\r\n"
-                                       "* Little Legends 2\r\n"
-                                       "* \"Little Legends 3\":/pools/27481",
-                        "id": 27492,
-                        "is_active": False,
-                        "name": "Little Legends 2",
-                        "post_count": 39,
-                        "post_ids": list,
-                        "updated_at": "2022-03-27T06:30:03.382-04:00"
-                    },
-                ],
-            },
-        }),
-        ("https://e621.net/post/show/535"),
-
-        ("https://e926.net/posts/535", {
-            "url": "17aec8ebd8fab098d321adcb62a2db59dab1f4bf",
-            "content": "66f46e96a893fba8e694c4e049b23c2acc9af462",
-        }),
-        ("https://e926.net/post/show/535"),
-    )
+    example = "https://e621.net/posts/12345"
 
     def posts(self):
         url = "{}/posts/{}.json".format(self.root, self.post_id)
@@ -202,21 +126,7 @@ class E621PostExtractor(E621Extractor, danbooru.DanbooruPostExtractor):
 class E621PopularExtractor(E621Extractor, danbooru.DanbooruPopularExtractor):
     """Extractor for popular images from e621"""
     pattern = BASE_PATTERN + r"/explore/posts/popular(?:\?([^#]*))?"
-    test = (
-        ("https://e621.net/explore/posts/popular"),
-        (("https://e621.net/explore/posts/popular"
-          "?date=2019-06-01&scale=month"), {
-            "pattern": r"https://static\d.e621.net/data/../../[0-9a-f]+",
-            "count": ">= 70",
-        }),
-
-        ("https://e926.net/explore/posts/popular"),
-        (("https://e926.net/explore/posts/popular"
-          "?date=2019-06-01&scale=month"), {
-            "pattern": r"https://static\d.e926.net/data/../../[0-9a-f]+",
-            "count": ">= 70",
-        }),
-    )
+    example = "https://e621.net/explore/posts/popular"
 
     def posts(self):
         return self._pagination("/popular.json", self.params)
@@ -228,19 +138,7 @@ class E621FavoriteExtractor(E621Extractor):
     directory_fmt = ("{category}", "Favorites", "{user_id}")
     archive_fmt = "f_{user_id}_{id}"
     pattern = BASE_PATTERN + r"/favorites(?:\?([^#]*))?"
-    test = (
-        ("https://e621.net/favorites"),
-        ("https://e621.net/favorites?page=2&user_id=53275", {
-            "pattern": r"https://static\d.e621.net/data/../../[0-9a-f]+",
-            "count": "> 260",
-        }),
-
-        ("https://e926.net/favorites"),
-        ("https://e926.net/favorites?page=2&user_id=53275", {
-            "pattern": r"https://static\d.e926.net/data/../../[0-9a-f]+",
-            "count": "> 260",
-        }),
-    )
+    example = "https://e621.net/favorites"
 
     def __init__(self, match):
         E621Extractor.__init__(self, match)