From ec6c1fd18e67c9ba05556dde46725967986e57e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 2 Nov 2015 00:20:40 +0100 Subject: [PATCH] [redhawkscans] use langcode to -name mapping --- gallery_dl/extractor/redhawkscans.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/redhawkscans.py b/gallery_dl/extractor/redhawkscans.py index 1e87cf4c..2a7c30b4 100644 --- a/gallery_dl/extractor/redhawkscans.py +++ b/gallery_dl/extractor/redhawkscans.py @@ -9,7 +9,7 @@ """Extract manga pages from http://manga.redhawkscans.com/""" from .common import Extractor, Message -from .. import text +from .. import text, iso639_1 import os.path import json import re @@ -20,7 +20,8 @@ info = { "directory": ["{category}", "{manga}", "c{chapter:>03}{chapter-minor} - {title}"], "filename": "{manga}_c{chapter:>03}{chapter-minor}_{page:>03}.{extension}", "pattern": [ - r"(?:https?://)?manga\.redhawkscans\.com/reader/read/(.+)(?:/page)?", + (r"(?:https?://)?manga\.redhawkscans\.com/reader/read/" + r"(.+/([a-z]{2})/\d+/\d+)(?:/page)?"), ], } @@ -32,6 +33,7 @@ class RedHawkScansExtractor(Extractor): Extractor.__init__(self) self.category = info["category"] self.part = match.group(1) + self.lang = match.group(2) def items(self): yield Message.Version, 1 @@ -60,6 +62,7 @@ class RedHawkScansExtractor(Extractor): "manga": text.unescape(manga), "chapter": match.group(2) or match.group(1), "chapter-minor": match.group(3) or "", - "language": "English", #TODO: lookup table for language codes (en, it, ch, ...) + "lang": self.lang, + "language": iso639_1.code_to_language(self.lang), "title": text.unescape(match.group(4) or ""), }, json.loads(json_data)