github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fallenangels] fix extraction of '.5' chapters

Browse Source
This commit is contained in:
Mike Fährmann
2020-10-23 16:56:08 +02:00
parent 28d8541cb3
commit b788712844
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gallery_dl/extractor/fallenangels.py
View File

@@ -17,7 +17,7 @@ class FallenangelsChapterExtractor(ChapterExtractor):
"""Extractor for manga-chapters from fascans.com""" """Extractor for manga-chapters from fascans.com"""
category = "fallenangels" category = "fallenangels"
pattern = (r"(?:https?://)?(manga|truyen)\.fascans\.com" pattern = (r"(?:https?://)?(manga|truyen)\.fascans\.com"
r"/manga/([^/]+)/(\d+)(\.[^/?#]+)?") r"/manga/([^/?#]+)/([^/?#]+)")
test = ( test = (
("https://manga.fascans.com/manga/chronos-ruler/20/1", { ("https://manga.fascans.com/manga/chronos-ruler/20/1", {
"url": "4604a7914566cc2da0ff789aa178e2d1c8c241e3", "url": "4604a7914566cc2da0ff789aa178e2d1c8c241e3",
@@ -28,12 +28,13 @@ class FallenangelsChapterExtractor(ChapterExtractor):
"keyword": "2bdb7334c0e3eceb9946ffd3132df679b4a94f6a", "keyword": "2bdb7334c0e3eceb9946ffd3132df679b4a94f6a",
}), }),
("http://manga.fascans.com/manga/rakudai-kishi-no-eiyuutan/19.5", { ("http://manga.fascans.com/manga/rakudai-kishi-no-eiyuutan/19.5", {
"keyword": "9fcca4c1a90d11f00764f62477ebe10bd408021c", "url": "273f6863966c83ea79ad5846a2866e08067d3f0e",
"keyword": "d1065685bfe0054c4ff2a0f20acb089de4cec253",
}), }),
) )
def __init__(self, match): def __init__(self, match):
self.version, self.manga, self.chapter, self.minor = match.groups() self.version, self.manga, self.chapter = match.groups()
url = "https://{}.fascans.com/manga/{}/{}/1".format( url = "https://{}.fascans.com/manga/{}/{}/1".format(
self.version, self.manga, self.chapter) self.version, self.manga, self.chapter)
ChapterExtractor.__init__(self, match, url) ChapterExtractor.__init__(self, match, url)
@@ -41,11 +42,12 @@ class FallenangelsChapterExtractor(ChapterExtractor):
def metadata(self, page): def metadata(self, page):
extr = text.extract_from(page) extr = text.extract_from(page)
lang = "vi" if self.version == "truyen" else "en" lang = "vi" if self.version == "truyen" else "en"
chapter, sep, minor = self.chapter.partition(".")
return { return {
"manga" : extr('name="description" content="', ' Chapter '), "manga" : extr('name="description" content="', ' Chapter '),
"title" : extr(': ', ' - Page 1'), "title" : extr(': ', ' - Page 1'),
"chapter" : self.chapter, "chapter" : chapter,
"chapter_minor": self.minor or "", "chapter_minor": sep + minor,
"lang" : lang, "lang" : lang,
"language": util.code_to_language(lang), "language": util.code_to_language(lang),
} }