From aacdab07615ca8baafa0eadc1d8b9fe9131b5834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 13 Aug 2025 17:50:40 +0200
Subject: [PATCH] [aibooru] support 'general.aibooru.online' &
 'aibooru.download'

---
 gallery_dl/extractor/danbooru.py |  2 +-
 test/results/aibooru.py          | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index ff071c57..019410c1 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -236,7 +236,7 @@ BASE_PATTERN = DanbooruExtractor.update({
     },
     "aibooru": {
         "root": None,
-        "pattern": r"(?:safe\.)?aibooru\.online",
+        "pattern": r"(?:safe\.|general\.)?aibooru\.(?:online|download)",
     },
     "booruvar": {
         "root": "https://booru.borvar.art",
diff --git a/test/results/aibooru.py b/test/results/aibooru.py
index 83e346c0..73951bc6 100644
--- a/test/results/aibooru.py
+++ b/test/results/aibooru.py
@@ -13,7 +13,15 @@ __tests__ = (
     "#category": ("Danbooru", "aibooru", "tag"),
     "#class"   : danbooru.DanbooruTagExtractor,
     "#pattern" : r"https://cdn\.aibooru\.download/original/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.\w+",
-    "#count"   : ">= 50",
+    "#count"   : range(160, 200),
+},
+
+{
+    "#url"     : "https://aibooru.download/posts?tags=center_frills",
+    "#category": ("Danbooru", "aibooru", "tag"),
+    "#class"   : danbooru.DanbooruTagExtractor,
+    "#pattern" : r"https://cdn\.aibooru\.download/original/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.\w+",
+    "#count"   : range(160, 200),
 },
 
 {
@@ -22,6 +30,14 @@ __tests__ = (
     "#class"   : danbooru.DanbooruTagExtractor,
 },
 
+{
+    "#url"     : "https://general.aibooru.online/posts?tags=center_frills",
+    "#category": ("Danbooru", "aibooru", "tag"),
+    "#class"   : danbooru.DanbooruTagExtractor,
+    "#pattern" : r"https://cdn\.aibooru\.download/original/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.\w+",
+    "#count"   : range(100, 120),
+},
+
 {
     "#url"     : "https://aibooru.online/pools/1",
     "#category": ("Danbooru", "aibooru", "pool"),
@@ -32,9 +48,17 @@ __tests__ = (
     "#url"     : "https://aibooru.online/posts/1",
     "#category": ("Danbooru", "aibooru", "post"),
     "#class"   : danbooru.DanbooruPostExtractor,
+    "#results" : "https://cdn.aibooru.download/original/8b/af/8baf2d5bb3d6f45deeabf7e1e659f562.png",
     "#sha1_content": "54d548743cd67799a62c77cbae97cfa0fec1b7e9",
 },
 
+{
+    "#url"     : "https://aibooru.download/posts/1",
+    "#category": ("Danbooru", "aibooru", "post"),
+    "#class"   : danbooru.DanbooruPostExtractor,
+    "#results" : "https://cdn.aibooru.download/original/8b/af/8baf2d5bb3d6f45deeabf7e1e659f562.png",
+},
+
 {
     "#url"     : "https://aibooru.online/posts/18315",
     "#comment" : "ugoira (#7630)",