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

[senmanga] fix extraction and download

Browse Source
This commit is contained in:
Mike Fährmann 2017-10-19 18:25:31 +02:00
parent 4d8387f93b
commit 2ace5c7b3c
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gallery_dl/extractor/senmanga.py
View File

@ -21,16 +21,16 @@ class SenmangaChapterExtractor(Extractor):
pattern = [r"(?:https?://)?raw\.senmanga\.com/([^/]+/[^/]+)"] pattern = [r"(?:https?://)?raw\.senmanga\.com/([^/]+/[^/]+)"]
test = [ test = [
("http://raw.senmanga.com/Bokura-wa-Minna-Kawaisou/37A/1", { ("http://raw.senmanga.com/Bokura-wa-Minna-Kawaisou/37A/1", {
"url": "32d88382fcad66859d089cd9a61249f375492ec5", "url": "5f95140ff511d8497e2ec08fa7267c6bb231faec",
"keyword": "705d941a150765edb33cd2707074bd703a93788c", "keyword": "705d941a150765edb33cd2707074bd703a93788c",
"content": "a791dda85ac0d37e3b36d754560cbb65b8dab5b9", "content": "0e37b1995708ffc175f2e175d91a518e6948c379",
}), }),
("http://raw.senmanga.com/Love-Lab/2016-03/1", { ("http://raw.senmanga.com/Love-Lab/2016-03/1", {
"url": "d4f37c7347e56a09f9679d63c1f24cd32621d0b8", "url": "8347b9f00c14b864dd3c19a1f5ae52adb2ef00de",
"keyword": "4e72e4ade57671ad0af9c8d81feeff4259d5bbec", "keyword": "0765e9d81b7430b3055b25a2627d6438f62de635",
}), }),
] ]
url_base = "http://raw.senmanga.com" url_base = "https://raw.senmanga.com"
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self) Extractor.__init__(self)
@ -38,7 +38,7 @@ class SenmangaChapterExtractor(Extractor):
self.chapter_url = "{}/{}/".format(self.url_base, part) self.chapter_url = "{}/{}/".format(self.url_base, part)
self.img_url = "{}/viewer/{}/".format(self.url_base, part) self.img_url = "{}/viewer/{}/".format(self.url_base, part)
self.session.headers["Referer"] = self.chapter_url self.session.headers["Referer"] = self.chapter_url
self.session.headers["User-Agent"] = "Mozilla 5.0" self.session.headers["User-Agent"] = "Mozilla/5.0"
def items(self): def items(self):
data = self.get_job_metadata() data = self.get_job_metadata()
@ -51,13 +51,13 @@ class SenmangaChapterExtractor(Extractor):
def get_job_metadata(self): def get_job_metadata(self):
"""Collect metadata for extractor-job""" """Collect metadata for extractor-job"""
page = self.request(self.chapter_url).text page = self.request(self.chapter_url).text
self.session.cookies.clear()
title, pos = text.extract(page, '<title>', '</title>') title, pos = text.extract(page, '<title>', '</title>')
count, pos = text.extract(page, '</select> of ', ' ', pos) count, pos = text.extract(page, '</select> of ', '\n', pos)
manga, pos = text.extract(title, '| Raw | ', ' | Chapter ') manga, _, chapter = title.partition(" - Chapter ")
chapter, pos = text.extract(title, '', ' | Page ', pos)
return { return {
"manga": text.unescape(manga.replace("-", " ")), "manga": text.unescape(manga),
"chapter_string": chapter, "chapter_string": chapter.partition(" - Page ")[0],
"count": util.safe_int(count), "count": util.safe_int(count),
"lang": "jp", "lang": "jp",
"language": "Japanese", "language": "Japanese",