From 804fd048ef4add577c93e0d7633b251ea48294da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 26 Jan 2025 16:40:36 +0100 Subject: [PATCH] [szurubooru] remove 'booru.foalcon.com' DNS record of foalcon.com no longer exists --- docs/supportedsites.md | 6 ----- gallery_dl/extractor/szurubooru.py | 8 ++---- test/results/foalcon.py | 41 ------------------------------ 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 test/results/foalcon.py diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 214c95e3..bd911879 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1479,12 +1479,6 @@ Consider all listed sites to potentially be NSFW. szurubooru Instances - - Foalcon - https://booru.foalcon.com/ - Posts, Tag Searches - - Bcbnsfw https://booru.bcbnsfw.space/ diff --git a/gallery_dl/extractor/szurubooru.py b/gallery_dl/extractor/szurubooru.py index b122f269..17135099 100644 --- a/gallery_dl/extractor/szurubooru.py +++ b/gallery_dl/extractor/szurubooru.py @@ -79,10 +79,6 @@ class SzurubooruExtractor(booru.BooruExtractor): BASE_PATTERN = SzurubooruExtractor.update({ - "foalcon": { - "root": "https://booru.foalcon.com", - "pattern": r"booru\.foalcon\.com", - }, "bcbnsfw": { "root": "https://booru.bcbnsfw.space", "pattern": r"booru\.bcbnsfw\.space", @@ -104,7 +100,7 @@ class SzurubooruTagExtractor(SzurubooruExtractor): directory_fmt = ("{category}", "{search_tags}") archive_fmt = "t_{search_tags}_{id}_{version}" pattern = BASE_PATTERN + r"/posts(?:/query=([^/?#]*))?" - example = "https://booru.foalcon.com/posts/query=TAG" + example = "https://booru.bcbnsfw.space/posts/query=TAG" def __init__(self, match): SzurubooruExtractor.__init__(self, match) @@ -127,7 +123,7 @@ class SzurubooruPostExtractor(SzurubooruExtractor): subcategory = "post" archive_fmt = "{id}_{version}" pattern = BASE_PATTERN + r"/post/(\d+)" - example = "https://booru.foalcon.com/post/12345" + example = "https://booru.bcbnsfw.space/post/12345" def posts(self): return (self._api_request("/post/" + self.groups[-1]),) diff --git a/test/results/foalcon.py b/test/results/foalcon.py deleted file mode 100644 index f2ee3a3a..00000000 --- a/test/results/foalcon.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. - -from gallery_dl.extractor import szurubooru - - -__tests__ = ( -{ - "#url" : "https://booru.foalcon.com/posts/query=simple_background", - "#category": ("szurubooru", "foalcon", "tag"), - "#class" : szurubooru.SzurubooruTagExtractor, - "#pattern" : r"https://booru\.foalcon\.com/data/posts/\d+_[0-9a-f]{16}\.\w+", - "#range" : "1-150", - "#count" : 150, -}, - -{ - "#url" : "https://booru.foalcon.com/posts/query=", - "#category": ("szurubooru", "foalcon", "tag"), - "#class" : szurubooru.SzurubooruTagExtractor, -}, - -{ - "#url" : "https://booru.foalcon.com/posts", - "#category": ("szurubooru", "foalcon", "tag"), - "#class" : szurubooru.SzurubooruTagExtractor, -}, - -{ - "#url" : "https://booru.foalcon.com/post/30092", - "#category": ("szurubooru", "foalcon", "post"), - "#class" : szurubooru.SzurubooruPostExtractor, - "#pattern" : r"https://booru\.foalcon\.com/data/posts/30092_b7d56e941888b624\.png", - "#sha1_url" : "dad4d4c67d87cd9a4ac429b3414747c27a95d5cb", - "#sha1_content": "86d1514c0ca8197950cc4b74e7a59b2dc76ebf9c", -}, - -)