Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-25 12:12:34 +01:00
Code Issues Releases Wiki Activity

[kissmanga] fix internal regex

Browse Source
This commit is contained in:
Mike Fährmann 2015-11-07 13:28:07 +01:00
parent 079330785a
commit 5abe32a32c
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gallery_dl/extractor/__init__.py
View File

@ -27,6 +27,7 @@ modules = [
"imgchili", "imgchili",
"imgth", "imgth",
"imgur", "imgur",
"kissmanga",
"konachan", "konachan",
"mangareader", "mangareader",
"nhentai", "nhentai",

11
gallery_dl/extractor/kissmanga.py
View File

@ -16,8 +16,8 @@ import re
info = { info = {
"category": "kissmanga", "category": "kissmanga",
"extractor": "KissmangaExtractor", "extractor": "KissmangaExtractor",
"directory": ["{category}", "{manga}", "c{chapter:>03} - {title}"], "directory": ["{category}", "{manga}", "c{chapter:>03}{chapter-minor} - {title}"],
"filename": "{manga}_c{chapter:>03}_{page:>03}.{extension}", "filename": "{manga}_c{chapter:>03}{chapter-minor}_{page:>03}.{extension}",
"pattern": [ "pattern": [
r"(?:https?://)?(?:www\.)?kissmanga\.com/Manga/.+/.+\?id=\d+", r"(?:https?://)?(?:www\.)?kissmanga\.com/Manga/.+/.+\?id=\d+",
], ],
@ -50,13 +50,16 @@ class KissmangaExtractor(Extractor):
"""Collect metadata for extractor-job""" """Collect metadata for extractor-job"""
manga, pos = text.extract(page, "Read manga\n", "\n") manga, pos = text.extract(page, "Read manga\n", "\n")
cinfo, pos = text.extract(page, "", "\n", pos) cinfo, pos = text.extract(page, "", "\n", pos)
match = re.match(r"(?:Vol.0*(\d+) )?Ch.0*(\d+)(?:: (.+))", cinfo) match = re.match(
r"(?:Vol.0*(\d+) )?(?:Ch.)?0*(\d+)(?:\.0*(\d+))?(?:: (.+))?", cinfo)
chminor = match.group(3)
return { return {
"category": info["category"], "category": info["category"],
"manga": manga, "manga": manga,
"volume": match.group(1) or "", "volume": match.group(1) or "",
"chapter": match.group(2), "chapter": match.group(2),
"title": match.group(3) or "", "chapter-minor": "."+chminor if chminor else "",
"title": match.group(4) or "",
"lang": "en", "lang": "en",
"language": "English", "language": "English",
} }