diff options
Diffstat (limited to 'gallery_dl/extractor/hiperdex.py')
| -rw-r--r-- | gallery_dl/extractor/hiperdex.py | 82 |
1 files changed, 45 insertions, 37 deletions
diff --git a/gallery_dl/extractor/hiperdex.py b/gallery_dl/extractor/hiperdex.py index 85cfe49..3883445 100644 --- a/gallery_dl/extractor/hiperdex.py +++ b/gallery_dl/extractor/hiperdex.py @@ -61,25 +61,28 @@ class HiperdexBase(): class HiperdexChapterExtractor(HiperdexBase, ChapterExtractor): """Extractor for manga chapters from hiperdex.com""" - pattern = (r"(?:https?://)?(?:www\.)?hiperdex\.com" + pattern = (r"(?:https?://)?(?:www\.)?hiperdex\.(?:com|net)" r"(/manga/([^/?&#]+)/([^/?&#]+))") - test = ("https://hiperdex.com/manga/domestic-na-kanojo/154-5/", { - "pattern": r"https://hiperdex.com/wp-content/uploads" - r"/WP-manga/data/manga_\w+/[0-9a-f]{32}/\d+\.webp", - "count": 9, - "keyword": { - "artist" : "Sasuga Kei", - "author" : "Sasuga Kei", - "chapter": 154, - "chapter_minor": ".5", - "description": "re:Natsuo Fujii is in love with his teacher, Hina", - "genre" : list, - "manga" : "Domestic na Kanojo", - "release": 2014, - "score" : float, - "type" : "Manga", - }, - }) + test = ( + ("https://hiperdex.com/manga/domestic-na-kanojo/154-5/", { + "pattern": r"https://hiperdex.com/wp-content/uploads" + r"/WP-manga/data/manga_\w+/[0-9a-f]{32}/\d+\.webp", + "count": 9, + "keyword": { + "artist" : "Sasuga Kei", + "author" : "Sasuga Kei", + "chapter": 154, + "chapter_minor": ".5", + "description": "re:Natsuo Fujii is in love with his teacher, ", + "genre" : list, + "manga" : "Domestic na Kanojo", + "release": 2014, + "score" : float, + "type" : "Manga", + }, + }), + ("https://hiperdex.net/manga/domestic-na-kanojo/154-5/"), + ) def __init__(self, match): path, self.manga, self.chapter = match.groups() @@ -99,24 +102,28 @@ class HiperdexChapterExtractor(HiperdexBase, ChapterExtractor): class HiperdexMangaExtractor(HiperdexBase, MangaExtractor): """Extractor for manga from hiperdex.com""" chapterclass = HiperdexChapterExtractor - pattern = r"(?:https?://)?(?:www\.)?hiperdex\.com(/manga/([^/?&#]+))/?$" - test = ("https://hiperdex.com/manga/youre-not-that-special/", { - "count": 51, - "pattern": HiperdexChapterExtractor.pattern, - "keyword": { - "artist" : "Bolp", - "author" : "Abyo4", - "chapter": int, - "chapter_minor": "", - "description": "re:I didn’t think much of the creepy girl in ", - "genre" : list, - "manga" : "You're Not That Special!", - "release": 2019, - "score" : float, - "status" : "Completed", - "type" : "Manhwa", - }, - }) + pattern = (r"(?:https?://)?(?:www\.)?hiperdex\.(?:com|net)" + r"(/manga/([^/?&#]+))/?$") + test = ( + ("https://hiperdex.com/manga/youre-not-that-special/", { + "count": 51, + "pattern": HiperdexChapterExtractor.pattern, + "keyword": { + "artist" : "Bolp", + "author" : "Abyo4", + "chapter": int, + "chapter_minor": "", + "description": "re:I didn’t think much of the creepy girl in ", + "genre" : list, + "manga" : "You’re Not That Special!", + "release": 2019, + "score" : float, + "status" : "Completed", + "type" : "Manhwa", + }, + }), + ("https://hiperdex.net/manga/youre-not-that-special/"), + ) def __init__(self, match): path, self.manga = match.groups() @@ -147,10 +154,11 @@ class HiperdexArtistExtractor(HiperdexBase, MangaExtractor): categorytransfer = False chapterclass = HiperdexMangaExtractor reverse = False - pattern = (r"(?:https?://)?(?:www\.)?hiperdex\.com" + pattern = (r"(?:https?://)?(?:www\.)?hiperdex\.(?:com|net)" r"(/manga-a(?:rtist|uthor)/([^/?&#]+))") test = ( ("https://hiperdex.com/manga-artist/beck-ho-an/"), + ("https://hiperdex.net/manga-artist/beck-ho-an/"), ("https://hiperdex.com/manga-author/viagra/", { "pattern": HiperdexMangaExtractor.pattern, "count": ">= 6", |