From 86f0597c951d999b1989504ddcf99f2c39de75d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 5 Dec 2022 19:28:50 +0100 Subject: [PATCH] [kissgoddess] remove module site does not host albums anymore --- docs/supportedsites.md | 6 --- gallery_dl/extractor/__init__.py | 1 - gallery_dl/extractor/kissgoddess.py | 82 ----------------------------- gallery_dl/version.py | 2 +- scripts/supportedsites.py | 1 - 5 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 gallery_dl/extractor/kissgoddess.py diff --git a/docs/supportedsites.md b/docs/supportedsites.md index fffe3ac6..439fcd30 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -433,12 +433,6 @@ Consider all sites to be NSFW unless otherwise known. Soundtracks - - Kiss Goddess - https://kissgoddess.com/ - Galleries, Models - - Kohlchan https://kohlchan.net/ diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index d2bbcbb7..3b553c84 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -74,7 +74,6 @@ modules = [ "keenspot", "kemonoparty", "khinsider", - "kissgoddess", "kohlchan", "komikcast", "lightroom", diff --git a/gallery_dl/extractor/kissgoddess.py b/gallery_dl/extractor/kissgoddess.py deleted file mode 100644 index 4ec685c2..00000000 --- a/gallery_dl/extractor/kissgoddess.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2022 Mike Fährmann -# -# 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://kissgoddess.com/""" - -from .common import GalleryExtractor, Extractor, Message -from .. import text, exception - - -class KissgoddessGalleryExtractor(GalleryExtractor): - """Extractor for image galleries on kissgoddess.com""" - category = "kissgoddess" - root = "https://kissgoddess.com" - pattern = r"(?:https?://)?(?:www\.)?kissgoddess\.com/album/(\d+)" - test = ("https://kissgoddess.com/album/18285.html", { - "pattern": r"https://pic\.kissgoddess\.com" - r"/gallery/16473/18285/s/\d+\.jpg", - "count": 19, - "keyword": { - "gallery_id": 18285, - "title": "[Young Champion Extra] 2016.02 No.03 菜乃花 安枝瞳 葉月あや", - }, - }) - - def __init__(self, match): - self.gallery_id = match.group(1) - url = "{}/album/{}.html".format(self.root, self.gallery_id) - GalleryExtractor.__init__(self, match, url) - - def metadata(self, page): - return { - "gallery_id": text.parse_int(self.gallery_id), - "title" : text.extr( - page, '', "<")[0].rpartition(" | "), - } - - def images(self, page): - pnum = 1 - - while page: - for url in text.extract_iter(page, "<img src='", "'"): - yield url, None - for url in text.extract_iter(page, "<img data-original='", "'"): - yield url, None - - pnum += 1 - url = "{}/album/{}_{}.html".format( - self.root, self.gallery_id, pnum) - try: - page = self.request(url).text - except exception.HttpError: - return - - -class KissgoddessModelExtractor(Extractor): - """Extractor for all galleries of a model on kissgoddess.com""" - category = "kissgoddess" - subcategory = "model" - root = "https://kissgoddess.com" - pattern = r"(?:https?://)?(?:www\.)?kissgoddess\.com/people/([^./?#]+)" - test = ("https://kissgoddess.com/people/aya-hazuki.html", { - "pattern": KissgoddessGalleryExtractor.pattern, - "count": ">= 7", - }) - - def __init__(self, match): - Extractor.__init__(self, match) - self.model = match.group(1) - - def items(self): - url = "{}/people/{}.html".format(self.root, self.model) - page = self.request(url).text - - data = {"_extractor": KissgoddessGalleryExtractor} - for path in text.extract_iter(page, 'thumb"><a href="/album/', '"'): - url = self.root + "/album/" + path - yield Message.Queue, url, data diff --git a/gallery_dl/version.py b/gallery_dl/version.py index d2890098..6975192a 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.24.1" +__version__ = "1.24.2-dev" diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index d8106095..edd65546 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -61,7 +61,6 @@ CATEGORY_MAP = { "kabeuchi" : "かべうち", "kemonoparty" : "Kemono", "kireicake" : "Kirei Cake", - "kissgoddess" : "Kiss Goddess", "lineblog" : "LINE BLOG", "livedoor" : "livedoor Blog", "omgmiamiswimwear": "Omg Miami Swimwear",