diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 09927ec9..0a0501da 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1025,6 +1025,12 @@ Consider all sites to be NSFW unless otherwise known. Pools, Popular Images, Posts, Tag Searches Supported + + Booruvar + https://booru.borvar.art/ + Pools, Popular Images, Posts, Tag Searches + + e621 Instances diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py index 5cfbf5c4..19a3aeff 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", + }, }) @@ -192,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"), @@ -238,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"), ) @@ -278,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"), ) @@ -309,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 9899d1c1..f434b2fc 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", "e6ai", + for category in ("danbooru", "atfbooru", "aibooru", "booruvar", + "e621", "e926", "e6ai", "instagram", "twitter", "subscribestar", "deviantart", "inkbunny", "tapas", "pillowfort", "mangadex", "vipergirls", "gfycat"):