diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 85a2f12a..f3699147 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1369,12 +1369,6 @@ Consider all listed sites to potentially be NSFW. Shimmie2 Instances - - Loudbooru - https://loudbooru.com/ - Posts, Tag Searches - - Giantessbooru https://sizechangebooru.com/ diff --git a/gallery_dl/extractor/shimmie2.py b/gallery_dl/extractor/shimmie2.py index a68f0db2..2d1b0954 100644 --- a/gallery_dl/extractor/shimmie2.py +++ b/gallery_dl/extractor/shimmie2.py @@ -69,11 +69,6 @@ class Shimmie2Extractor(BaseExtractor): BASE_PATTERN = Shimmie2Extractor.update({ - "loudbooru": { - "root": "https://loudbooru.com", - "pattern": r"loudbooru\.com", - "cookies": {"ui-tnc-agreed": "true"}, - }, "giantessbooru": { "root": "https://sizechangebooru.com", "pattern": r"(?:sizechange|giantess)booru\.com", @@ -105,7 +100,7 @@ class Shimmie2TagExtractor(Shimmie2Extractor): directory_fmt = ("{category}", "{search_tags}") file_url_fmt = "{}/_images/{}/{}%20-%20{}.{}" pattern = BASE_PATTERN + r"post/list/([^/?#]+)(?:/(\d+))?()" - example = "https://loudbooru.com/post/list/TAG/1" + example = "https://vidya.pics/post/list/TAG/1" def __init__(self, match): Shimmie2Extractor.__init__(self, match) @@ -206,7 +201,7 @@ class Shimmie2PostExtractor(Shimmie2Extractor): """Extractor for single shimmie2 posts""" subcategory = "post" pattern = BASE_PATTERN + r"post/view/(\d+)" - example = "https://loudbooru.com/post/view/12345" + example = "https://vidya.pics/post/view/12345" def __init__(self, match): Shimmie2Extractor.__init__(self, match) diff --git a/test/results/loudbooru.py b/test/results/loudbooru.py deleted file mode 100644 index 58236b7d..00000000 --- a/test/results/loudbooru.py +++ /dev/null @@ -1,37 +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 shimmie2 - - -__tests__ = ( -{ - "#url" : "https://loudbooru.com/post/list/original_character/1", - "#category": ("shimmie2", "loudbooru", "tag"), - "#class" : shimmie2.Shimmie2TagExtractor, - "#pattern" : r"https://loudbooru\.com/_images/[0-9a-f]{32}/\d+", - "#range" : "1-100", - "#count" : 100, -}, - -{ - "#url" : "https://loudbooru.com/post/view/33828", - "#category": ("shimmie2", "loudbooru", "post"), - "#class" : shimmie2.Shimmie2PostExtractor, - "#pattern" : r"https://loudbooru\.com/_images/.+\.png", - "#sha1_content": "a4755f787ba23ae2aa297a46810f802ca9032739", - - "extension": "png", - "file_url" : "https://loudbooru.com/_images/ca2638d903c86e8337fe9aeb4974be88/33828%20-%202020%20artist%3Astikyfinkaz%20character%3Alisa_loud%20cover%20fanfiction%3Aplatz_eins%20frowning%20half-closed_eyes%20solo%20text%20title_card.png", - "filename" : "33828 - 2020 artist:stikyfinkaz character:lisa_loud cover fanfiction:platz_eins frowning half-closed_eyes solo text title_card", - "height" : 1920, - "id" : 33828, - "md5" : "ca2638d903c86e8337fe9aeb4974be88", - "tags" : "2020 artist:stikyfinkaz character:lisa_loud cover fanfiction:platz_eins frowning half-closed_eyes solo text title_card", - "width" : 1078, -}, - -)