From 0761b22a7fe53abed2a4e4cf108aa9f3aa5b4ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 24 May 2024 17:13:10 +0200 Subject: [PATCH] [hiperdex] update domain to 'hiperdex.top' (#5635) --- docs/supportedsites.md | 2 +- gallery_dl/extractor/hiperdex.py | 20 ++++++++++---------- test/results/hiperdex.py | 12 +++++++++--- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 7b32fe05..4ab7a38e 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -321,7 +321,7 @@ Consider all listed sites to potentially be NSFW. Hiperdex - https://hiperdex.com/ + https://hiperdex.top/ Artists, Chapters, Manga diff --git a/gallery_dl/extractor/hiperdex.py b/gallery_dl/extractor/hiperdex.py index aadce6ca..4a9759ff 100644 --- a/gallery_dl/extractor/hiperdex.py +++ b/gallery_dl/extractor/hiperdex.py @@ -6,7 +6,7 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -"""Extractors for https://hiperdex.com/""" +"""Extractors for https://hiperdex.top/""" from .common import ChapterExtractor, MangaExtractor from .. import text @@ -14,18 +14,18 @@ from ..cache import memcache import re BASE_PATTERN = (r"((?:https?://)?(?:www\.)?" - r"(?:1st)?hiperdex\d?\.(?:com|net|info))") + r"(?:1st)?hiperdex\d?\.(?:com|net|info|top))") class HiperdexBase(): """Base class for hiperdex extractors""" category = "hiperdex" - root = "https://hiperdex.com" + root = "https://hiperdex.top" @memcache(keyarg=1) def manga_data(self, manga, page=None): if not page: - url = "{}/mangas/{}/".format(self.root, manga) + url = "{}/manga/{}/".format(self.root, manga) page = self.request(url).text extr = text.extract_from(page) @@ -67,9 +67,9 @@ class HiperdexBase(): class HiperdexChapterExtractor(HiperdexBase, ChapterExtractor): - """Extractor for manga chapters from hiperdex.com""" + """Extractor for hiperdex manga chapters""" pattern = BASE_PATTERN + r"(/mangas?/([^/?#]+)/([^/?#]+))" - example = "https://hiperdex.com/mangas/MANGA/CHAPTER/" + example = "https://hiperdex.top/manga/MANGA/CHAPTER/" def __init__(self, match): root, path, self.manga, self.chapter = match.groups() @@ -88,10 +88,10 @@ class HiperdexChapterExtractor(HiperdexBase, ChapterExtractor): class HiperdexMangaExtractor(HiperdexBase, MangaExtractor): - """Extractor for manga from hiperdex.com""" + """Extractor for hiperdex manga""" chapterclass = HiperdexChapterExtractor pattern = BASE_PATTERN + r"(/mangas?/([^/?#]+))/?$" - example = "https://hiperdex.com/mangas/MANGA/" + example = "https://hiperdex.top/manga/MANGA/" def __init__(self, match): root, path, self.manga = match.groups() @@ -121,13 +121,13 @@ class HiperdexMangaExtractor(HiperdexBase, MangaExtractor): class HiperdexArtistExtractor(HiperdexBase, MangaExtractor): - """Extractor for an artists's manga on hiperdex.com""" + """Extractor for an artists's manga on hiperdex""" subcategory = "artist" categorytransfer = False chapterclass = HiperdexMangaExtractor reverse = False pattern = BASE_PATTERN + r"(/manga-a(?:rtist|uthor)/(?:[^/?#]+))" - example = "https://hiperdex.com/manga-artist/NAME/" + example = "https://hiperdex.top/manga-artist/NAME/" def __init__(self, match): self.root = text.ensure_http_scheme(match.group(1)) diff --git a/test/results/hiperdex.py b/test/results/hiperdex.py index bb421142..5c17659b 100644 --- a/test/results/hiperdex.py +++ b/test/results/hiperdex.py @@ -9,10 +9,10 @@ from gallery_dl.extractor import hiperdex __tests__ = ( { - "#url" : "https://hiperdex.com/mangas/domestic-na-kanojo/154-5/", + "#url" : "https://hiperdex.com/manga/domestic-na-kanojo/154-5/", "#category": ("", "hiperdex", "chapter"), "#class" : hiperdex.HiperdexChapterExtractor, - "#pattern" : r"https://(1st)?hiperdex\d?.(com|net|info)/wp-content/uploads/WP-manga/data/manga_\w+/[0-9a-f]{32}/\d+\.webp", + "#pattern" : r"https://(1st)?hiperdex\d?.(com|net|info|top)/wp-content/uploads/WP-manga/data/manga_\w+/[0-9a-f]{32}/\d+\.webp", "#count" : 9, "artist" : "Sasuga Kei", @@ -28,7 +28,7 @@ __tests__ = ( }, { - "#url" : "https://hiperdex.com/manga/domestic-na-kanojo/154-5/", + "#url" : "https://hiperdex.com/mangas/domestic-na-kanojo/154-5/", "#category": ("", "hiperdex", "chapter"), "#class" : hiperdex.HiperdexChapterExtractor, }, @@ -57,6 +57,12 @@ __tests__ = ( "#class" : hiperdex.HiperdexChapterExtractor, }, +{ + "#url" : "https://hiperdex.top/manga/domestic-na-kanojo/154-5/", + "#category": ("", "hiperdex", "chapter"), + "#class" : hiperdex.HiperdexChapterExtractor, +}, + { "#url" : "https://hiperdex.com/manga/1603231576-youre-not-that-special/", "#category": ("", "hiperdex", "manga"),