diff --git a/docs/supportedsites.md b/docs/supportedsites.md index cebbc033..47820537 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -691,6 +691,12 @@ Consider all listed sites to potentially be NSFW. Chapters, Manga + + MangaTown + https://www.mangatown.com/ + Chapters, Manga + + Mangoxo https://www.mangoxo.com/ diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index b57d7517..4ec16766 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -133,6 +133,7 @@ modules = [ "mangaread", "mangareader", "mangataro", + "mangatown", "mangoxo", "misskey", "motherless", diff --git a/gallery_dl/extractor/mangatown.py b/gallery_dl/extractor/mangatown.py new file mode 100644 index 00000000..ccfd7551 --- /dev/null +++ b/gallery_dl/extractor/mangatown.py @@ -0,0 +1,96 @@ +# -*- 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://www.mangatown.com/""" + +from .common import ChapterExtractor, MangaExtractor +from .. import text + +BASE_PATTERN = r"(?:https?://)?(?:www\.)?mangatown\.com" + + +class MangatownBase(): + """Base class for mangatown extractors""" + category = "mangatown" + root = "https://www.mangatown.com" + + +class MangatownChapterExtractor(MangatownBase, ChapterExtractor): + """Extractor for manga-chapters from mangatown.com""" + pattern = BASE_PATTERN + r"(/manga/[^/?#]+(?:/v0*(\d+))?/c(\d+[^/?#]*))" + example = "https://www.mangatown.com/manga/TITLE/c001/1.html" + + def __init__(self, match): + self.part, self.volume, self.chapter = match.groups() + self.base = f"{self.root}{self.part}/" + ChapterExtractor.__init__(self, match, self.base + "1.html") + + def metadata(self, page): + manga, pos = text.extract( + page, 'property="og:title" content="', '"') + count , pos = text.extract(page, "total_pages = ", ";", pos) + manga_id , pos = text.extract(page, "series_id=", ";", pos) + chapter_id, pos = text.extract(page, "chapter_id=", ";", pos) + + chapter, dot, minor = self.chapter.partition(".") + + return { + "manga" : text.unescape(manga), + "manga_id": text.parse_int(manga_id), + "volume" : text.parse_int(self.volume), + "chapter" : text.parse_int(chapter), + "chapter_minor": dot + minor, + "chapter_id": text.parse_int(chapter_id), + "count" : text.parse_int(count), + "lang" : "en", + "language": "English", + } + + def images(self, page): + pnum = 1 + + while True: + url = (text.extr(page, 'id="image" src="', '"') or + text.extr(page, '', '') + manga = manga.partition(" Manga")[0].replace("Read ", "", 1) + manga = text.unescape(manga) + + page = text.extract(page, 'class="chapter_list"', '', pos)[0] + for ch in text.extract_iter(page, "
  • ", "
  • "): + path , pos = text.extract(ch, '", "<", pos) + date , pos = text.extract(ch, 'class="time">', "<", pos) + + chapter = text.extr(path, "/c", "/") + chapter, sep, minor = chapter.partition(".") + + results.append((self.root + path, { + "manga" : manga, + "chapter" : text.parse_int(chapter), + "chapter_minor": sep + minor, + "title" : "" if title is None else text.unescape(title), + "date" : date, + "lang" : "en", + "language": "English", + })) + return results diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index 0f950c06..a731d171 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -128,6 +128,7 @@ CATEGORY_MAP = { "mangafox" : "Manga Fox", "mangahere" : "Manga Here", "mangakakalot" : "MangaKakalot", + "mangatown" : "MangaTown", "manganato" : "MangaNato", "mangapark" : "MangaPark", "mangaread" : "MangaRead", diff --git a/test/results/mangatown.py b/test/results/mangatown.py new file mode 100644 index 00000000..0bfece3d --- /dev/null +++ b/test/results/mangatown.py @@ -0,0 +1,64 @@ +# -*- 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 mangatown + + +__tests__ = ( +{ + "#url" : "https://www.mangatown.com/manga/kimetsu_no_yaiba/c001/", + "#class" : mangatown.MangatownChapterExtractor, + "#pattern" : r"https://zjcdn\.mangahere\.org/.*", + "#count" : ">= 20", + + "chapter" : 1, + "chapter_id" : 368511, + "chapter_minor": "", + "count" : 55, + "page" : range(1, 55), + "extension" : "jpg", + "filename" : str, + "lang" : "en", + "language" : "English", + "manga" : "Kimetsu no Yaiba", + "manga_id" : 21437, + "volume" : 0, + +}, + +{ + "#url" : "https://www.mangatown.com/manga/kimetsu_no_yaiba/c001/1.html", + "#class" : mangatown.MangatownChapterExtractor, + "#pattern" : r"https://zjcdn\.mangahere\.org/.*", +}, + +{ + "#url" : "http://www.mangatown.com/manga/kimetsu_no_yaiba/c001/", + "#class" : mangatown.MangatownChapterExtractor, +}, + +{ + "#url" : "https://www.mangatown.com/manga/kimetsu_no_yaiba/", + "#class" : mangatown.MangatownMangaExtractor, + "#pattern" : mangatown.MangatownChapterExtractor.pattern, + "#count" : ">= 100", + + "chapter" : int, + "chapter_minor": {"", ".5", ".6"}, + "date" : str, + "lang" : "en", + "language" : "English", + "manga" : "Kimetsu no Yaiba", + "title" : str, + +}, + +{ + "#url" : "http://www.mangatown.com/manga/kimetsu_no_yaiba/", + "#class" : mangatown.MangatownMangaExtractor, +}, + +)