diff --git a/gallery_dl/extractor/mangapark.py b/gallery_dl/extractor/mangapark.py index 7ee0bff8..b11f81de 100644 --- a/gallery_dl/extractor/mangapark.py +++ b/gallery_dl/extractor/mangapark.py @@ -74,7 +74,8 @@ class MangaparkBase(): class MangaparkChapterExtractor(MangaparkBase, ChapterExtractor): """Extractor for manga-chapters from mangapark.net""" - pattern = BASE_PATTERN + r"/title/[^/?#]+/(\d+)" + pattern = (BASE_PATTERN + + r"/(?:title/[^/?#]+/|comic/\d+/[^/?#]+/[^/?#]+-i)(\d+)") example = "https://mangapark.net/title/MANGA/12345-en-ch.01" def __init__(self, match): @@ -114,7 +115,7 @@ class MangaparkChapterExtractor(MangaparkBase, ChapterExtractor): class MangaparkMangaExtractor(MangaparkBase, Extractor): """Extractor for manga from mangapark.net""" subcategory = "manga" - pattern = BASE_PATTERN + r"/title/(\d+)(?:-[^/?#]*)?/?$" + pattern = BASE_PATTERN + r"/(?:title|comic)/(\d+)(?:[/-][^/?#]*)?/?$" example = "https://mangapark.net/title/12345-MANGA" def __init__(self, match): diff --git a/test/results/mangapark.py b/test/results/mangapark.py index 43b50437..b40ab3fc 100644 --- a/test/results/mangapark.py +++ b/test/results/mangapark.py @@ -42,6 +42,16 @@ __tests__ = ( "volume" : 12, }, +{ + "#url" : "https://mangapark.net/comic/10426/aria/c60.2-en-i6712231", + "#comment" : "v3 URL", + "#class" : mangapark.MangaparkChapterExtractor, + "#pattern" : r"https://[\w-]+\.mp\w+\.org/media/2001/a2e/61e2acf8062ec26ee5ef8e2a/\d+_\d+_\d+_\d+\.jpeg", + "#count" : 70, + + "chapter_id": 6712231, +}, + { "#url" : "https://mangapark.com/title/114972-aria/6710214-en-ch.60.2", "#class" : mangapark.MangaparkChapterExtractor, @@ -115,6 +125,16 @@ __tests__ = ( "volume" : int, }, +{ + "#url" : "https://mangapark.net/comic/10426/aria", + "#comment" : "v3 URL", + "#class" : mangapark.MangaparkMangaExtractor, + "#pattern" : mangapark.MangaparkChapterExtractor.pattern, + "#count" : 74, + + "manga_id" : 10426, +}, + { "#url" : "https://mangapark.net/title/10504-en-mushishi", "#comment" : "'source' option",