From 822a77d8466948c07216b537050da28a2597990d Mon Sep 17 00:00:00 2001
From: thatfuckingbird <67429906+thatfuckingbird@users.noreply.github.com>
Date: Wed, 24 May 2023 19:06:40 +0200
Subject: [PATCH 1/2] [danbooru] add support for booru.borvar.art instance

---
 gallery_dl/extractor/danbooru.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index 5cfbf5c4..0ce77ad3 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -161,6 +161,10 @@ BASE_PATTERN = DanbooruExtractor.update({
         "root": None,
         "pattern": r"(?:safe.)?aibooru\.online",
     },
+    "booruvar": {
+        "root": "https://booru.borvar.art",
+        "pattern": r"booru\.borvar\.art"
+    },
 })
 
 

From 63326e3168f50db1fb3b4ad696676f472f8b2b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Tue, 18 Jul 2023 18:29:57 +0200
Subject: [PATCH 2/2] [danbooru] add tests for booruvar

---
 docs/supportedsites.md           |  6 ++++++
 gallery_dl/extractor/danbooru.py | 15 ++++++++++++++-
 test/test_results.py             |  3 ++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index e42cdf67..63ac6d31 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -1019,6 +1019,12 @@ Consider all sites to be NSFW unless otherwise known.
     <td>Pools, Popular Images, Posts, Tag Searches</td>
     <td>Supported</td>
 </tr>
+<tr>
+    <td>Booruvar</td>
+    <td>https://booru.borvar.art/</td>
+    <td>Pools, Popular Images, Posts, Tag Searches</td>
+    <td></td>
+</tr>
 
 <tr>
     <td colspan="4"><strong>e621 Instances</strong></td>
diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index 0ce77ad3..19a3aeff 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -163,7 +163,7 @@ BASE_PATTERN = DanbooruExtractor.update({
     },
     "booruvar": {
         "root": "https://booru.borvar.art",
-        "pattern": r"booru\.borvar\.art"
+        "pattern": r"booru\.borvar\.art",
     },
 })
 
@@ -196,6 +196,11 @@ class DanbooruTagExtractor(DanbooruExtractor):
                        r"/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.\w+",
             "count": ">= 3",
         }),
+        ("https://booru.borvar.art/posts?tags=chibi&z=1", {
+            "pattern": r"https://booru\.borvar\.art/data/original"
+                       r"/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.\w+",
+            "count": ">= 3",
+        }),
         ("https://hijiribe.donmai.us/posts?tags=bonocho"),
         ("https://sonohara.donmai.us/posts?tags=bonocho"),
         ("https://safebooru.donmai.us/posts?tags=bonocho"),
@@ -242,6 +247,10 @@ class DanbooruPoolExtractor(DanbooruExtractor):
             "url": "902549ffcdb00fe033c3f63e12bc3cb95c5fd8d5",
             "count": 6,
         }),
+        ("https://booru.borvar.art/pools/2", {
+            "url": "77fa3559a3fc919f72611f4e3dd0f919d19d3e0d",
+            "count": 4,
+        }),
         ("https://aibooru.online/pools/1"),
         ("https://danbooru.donmai.us/pool/show/7659"),
     )
@@ -282,6 +291,9 @@ class DanbooruPostExtractor(DanbooruExtractor):
         ("https://aibooru.online/posts/1", {
             "content": "54d548743cd67799a62c77cbae97cfa0fec1b7e9",
         }),
+        ("https://booru.borvar.art/posts/1487", {
+            "content": "91273ac1ea413a12be468841e2b5804656a50bff",
+        }),
         ("https://danbooru.donmai.us/post/show/294929"),
     )
 
@@ -313,6 +325,7 @@ class DanbooruPopularExtractor(DanbooruExtractor):
         }),
         ("https://booru.allthefallen.moe/explore/posts/popular"),
         ("https://aibooru.online/explore/posts/popular"),
+        ("https://booru.borvar.art/explore/posts/popular"),
     )
 
     def __init__(self, match):
diff --git a/test/test_results.py b/test/test_results.py
index d28496b3..72654a93 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -322,7 +322,8 @@ def setup_test_config():
     config.set(("extractor", "mangoxo")   , "username", "LiQiang3")
     config.set(("extractor", "mangoxo")   , "password", "5zbQF10_5u25259Ma")
 
-    for category in ("danbooru", "atfbooru", "aibooru", "e621", "e926",
+    for category in ("danbooru", "atfbooru", "aibooru", "booruvar",
+                     "e621", "e926",
                      "instagram", "twitter", "subscribestar", "deviantart",
                      "inkbunny", "tapas", "pillowfort", "mangadex"):
         config.set(("extractor", category), "username", None)