diff --git a/gallery_dl/extractor/redhawkscans.py b/gallery_dl/extractor/redhawkscans.py index 8d890ddf..21940118 100644 --- a/gallery_dl/extractor/redhawkscans.py +++ b/gallery_dl/extractor/redhawkscans.py @@ -18,10 +18,10 @@ import re info = { "category": "redhawkscans", "extractor": "RedHawkScansExtractor", - "directory": ["{category}", "{manga}", "c{chapter:>03} - {title}"], - "filename": "{manga}_c{chapter:>03}_{page:>03}.{extension}", + "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/([^/]+/[^/]+/[^/]+/[^/]+).*", + r"(?:https?://)?manga\.redhawkscans\.com/reader/read/(.+)(?:/page)?.*", ], } @@ -47,16 +47,17 @@ class RedHawkScansExtractor(SequentialExtractor): def get_job_metadata(self): """Collect metadata for extractor-job""" - page = self.request(self.url_base + self.part).text + page = self.request(self.url_base + self.part).content.decode("utf-8") _ , pos = self.extract(page, '