diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index c0fee2a8..23459d0c 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -589,12 +589,6 @@ Consider all listed sites to potentially be NSFW.
Albums |
|
-
- Nudecollect |
- https://nudecollect.com/ |
- Albums, individual Images |
- |
-
Patreon |
https://www.patreon.com/ |
@@ -1003,6 +997,12 @@ Consider all listed sites to potentially be NSFW.
individual Images, Tag Searches |
Supported |
+
+ Zzup |
+ https://zzup.com/ |
+ Galleries |
+ |
+
かべうち |
https://kabe-uchiroom.com/ |
diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py
index 8d974ecc..6fca0120 100644
--- a/gallery_dl/extractor/__init__.py
+++ b/gallery_dl/extractor/__init__.py
@@ -107,7 +107,6 @@ modules = [
"nitter",
"nozomi",
"nsfwalbum",
- "nudecollect",
"paheal",
"patreon",
"philomena",
diff --git a/gallery_dl/extractor/nudecollect.py b/gallery_dl/extractor/nudecollect.py
deleted file mode 100644
index bda5d774..00000000
--- a/gallery_dl/extractor/nudecollect.py
+++ /dev/null
@@ -1,87 +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.
-
-"""Extractors for https://nudecollect.com/"""
-
-from .common import GalleryExtractor
-from .. import text
-
-
-class NudecollectExtractor(GalleryExtractor):
- """Base class for Nudecollect extractors"""
- category = "nudecollect"
- directory_fmt = ("{category}", "{title}")
- filename_fmt = "{slug}_{num:>03}.{extension}"
- archive_fmt = "{slug}_{num}"
- root = "https://www.nudecollect.com"
-
- def request(self, url, **kwargs):
- kwargs["allow_redirects"] = False
- return GalleryExtractor.request(self, url, **kwargs)
-
- @staticmethod
- def get_title(page):
- return text.unescape(text.extr(page, "", ""))[31:]
-
- @staticmethod
- def get_image(page):
- return text.extr(page, '05}" + p2[4:]
- return [(ufmt.format(num), None) for num in range(1, self.count + 1)]
diff --git a/test/results/nudecollect.py b/test/results/nudecollect.py
deleted file mode 100644
index 423c915f..00000000
--- a/test/results/nudecollect.py
+++ /dev/null
@@ -1,56 +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 nudecollect
-
-
-__tests__ = (
-{
- "#url" : "https://www.nudecollect.com/content/20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust/image-4-pics-108-mirror-43.html",
- "#category": ("", "nudecollect", "image"),
- "#class" : nudecollect.NudecollectImageExtractor,
- "#pattern" : r"https://mirror\d+\.nudecollect\.com/showimage/nudecollect-8769086487/image00004-5896498214-43-9689595623/20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust/9879560327/nudecollect\.com\.jpg",
-
- "slug" : "20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust",
- "title" : "20201220 Teenpornstorage Patritcy Vanessa Lesbian Lust",
- "num" : 4,
- "count" : 108,
- "mirror": 43,
-},
-
-{
- "#url" : "https://www.nudecollect.com/content/20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust/image-10-pics-108-mirror-43.html",
- "#category": ("", "nudecollect", "image"),
- "#class" : nudecollect.NudecollectImageExtractor,
-},
-
-{
- "#url" : "https://www.nudecollect.com/content/20170219_TheWhiteBoxxx_Caprice_Tracy_Loves_Hot_ass_fingering_and_sensual_lesbian_sex_with_alluring_Czech_babes_x125_1080px/index-mirror-67-125.html",
- "#category": ("", "nudecollect", "album"),
- "#class" : nudecollect.NudecollectAlbumExtractor,
- "#pattern" : r"https://mirror\d+\.nudecollect\.com/showimage/nudecollect-8769086487/image00\d\d\d-5896498214-67-9689595623/20170219_TheWhiteBoxxx_Caprice_Tracy_Loves_Hot_ass_fingering_and_sensual_lesbian_sex_with_alluring_Czech_babes_x125_1080px/9879560327/nudecollect\.com\.jpg",
- "#count" : 125,
-
- "slug" : "20170219_TheWhiteBoxxx_Caprice_Tracy_Loves_Hot_ass_fingering_and_sensual_lesbian_sex_with_alluring_Czech_babes_x125_1080px",
- "title" : "20170219 TheWhiteBoxxx Caprice Tracy Loves Hot ass fingering and sensual lesbian sex with alluring Czech babes x125 1080px",
- "num" : int,
- "mirror": 67,
-},
-
-{
- "#url" : "https://www.nudecollect.com/content/20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust/page-1-pics-108-mirror-43.html",
- "#category": ("", "nudecollect", "album"),
- "#class" : nudecollect.NudecollectAlbumExtractor,
- "#pattern" : r"https://mirror\d+\.nudecollect\.com/showimage/nudecollect-8769086487/image00\d\d\d-5896498214-43-9689595623/20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust/9879560327/nudecollect\.com\.jpg",
- "#count" : 108,
-
- "slug" : "20201220_Teenpornstorage_Patritcy_Vanessa_Lesbian_Lust",
- "title" : "20201220 Teenpornstorage Patritcy Vanessa Lesbian Lust",
- "num" : int,
- "mirror": 43,
-},
-
-)
diff --git a/test/results/zzup.py b/test/results/zzup.py
index ad68e41c..87b9bada 100644
--- a/test/results/zzup.py
+++ b/test/results/zzup.py
@@ -28,4 +28,3 @@ __tests__ = (
},
)
-