diff options
Diffstat (limited to 'gallery_dl/extractor/mangaread.py')
| -rw-r--r-- | gallery_dl/extractor/mangaread.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gallery_dl/extractor/mangaread.py b/gallery_dl/extractor/mangaread.py index 6970b4f..a3bdf39 100644 --- a/gallery_dl/extractor/mangaread.py +++ b/gallery_dl/extractor/mangaread.py @@ -7,8 +7,7 @@ """Extractors for https://mangaread.org/""" from .common import ChapterExtractor, MangaExtractor -from .. import text, exception -import re +from .. import text, util, exception class MangareadBase(): @@ -16,11 +15,10 @@ class MangareadBase(): category = "mangaread" root = "https://www.mangaread.org" - @staticmethod - def parse_chapter_string(chapter_string, data): - match = re.match( - r"(?:(.+)\s*-\s*)?[Cc]hapter\s*(\d+)(\.\d+)?(?:\s*-\s*(.+))?", - text.unescape(chapter_string).strip()) + def parse_chapter_string(self, chapter_string, data): + match = util.re( + r"(?:(.+)\s*-\s*)?[Cc]hapter\s*(\d+)(\.\d+)?(?:\s*-\s*(.+))?" + ).match(text.unescape(chapter_string).strip()) manga, chapter, minor, title = match.groups() manga = manga.strip() if manga else "" data["manga"] = data.pop("manga", manga) @@ -65,14 +63,14 @@ class MangareadMangaExtractor(MangareadBase, MangaExtractor): if 'class="error404' in page: raise exception.NotFoundError("manga") data = self.metadata(page) - result = [] + results = [] for chapter in text.extract_iter( page, '<li class="wp-manga-chapter', "</li>"): url , pos = text.extract(chapter, '<a href="', '"') info, _ = text.extract(chapter, ">", "</a>", pos) self.parse_chapter_string(info, data) - result.append((url, data.copy())) - return result + results.append((url, data.copy())) + return results def metadata(self, page): extr = text.extract_from(text.extr( @@ -84,7 +82,7 @@ class MangareadMangaExtractor(MangareadBase, MangaExtractor): "rating" : text.parse_float( extr('total_votes">', "</span>").strip()), "manga_alt" : text.remove_html( - extr("Alternative </h5>\n</div>", "</div>")).split("; "), + extr("Alternative\t\t</h5>\n\t</div>", "</div>")).split("; "), "author" : list(text.extract_iter( extr('class="author-content">', "</div>"), '"tag">', "</a>")), "artist" : list(text.extract_iter( |