simplify extractor constants
- single strings for URL patterns - tuples instead of lists for 'directory_fmt' and 'test' - single-tuple tests where applicable
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright 2017-2018 Mike Fährmann
|
||||
# Copyright 2017-2019 Mike Fährmann
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License version 2 as
|
||||
@@ -16,9 +16,9 @@ import json
|
||||
class FallenangelsChapterExtractor(ChapterExtractor):
|
||||
"""Extractor for manga-chapters from fascans.com"""
|
||||
category = "fallenangels"
|
||||
pattern = [(r"(?:https?://)?(manga|truyen)\.fascans\.com"
|
||||
r"/manga/([^/]+)/(\d+)(\.[^/?&#]+)?")]
|
||||
test = [
|
||||
pattern = (r"(?:https?://)?(manga|truyen)\.fascans\.com"
|
||||
r"/manga/([^/]+)/(\d+)(\.[^/?&#]+)?")
|
||||
test = (
|
||||
("https://manga.fascans.com/manga/chronos-ruler/20/1", {
|
||||
"url": "4604a7914566cc2da0ff789aa178e2d1c8c241e3",
|
||||
"keyword": "4e1722cf0ed8ee5fc5c64147ac3f39342e767cd8",
|
||||
@@ -30,7 +30,7 @@ class FallenangelsChapterExtractor(ChapterExtractor):
|
||||
("http://manga.fascans.com/manga/rakudai-kishi-no-eiyuutan/19.5", {
|
||||
"keyword": "bf7dd1c462a80ffe50b92fec00b7acda2f8b800e",
|
||||
}),
|
||||
]
|
||||
)
|
||||
|
||||
def __init__(self, match):
|
||||
self.version, self.manga, self.chapter, self.minor = match.groups()
|
||||
@@ -64,9 +64,9 @@ class FallenangelsChapterExtractor(ChapterExtractor):
|
||||
class FallenangelsMangaExtractor(MangaExtractor):
|
||||
"""Extractor for manga from fascans.com"""
|
||||
category = "fallenangels"
|
||||
pattern = [r"(?:https?://)?((manga|truyen)\.fascans\.com/manga/[^/]+)/?$"]
|
||||
pattern = r"(?:https?://)?((manga|truyen)\.fascans\.com/manga/[^/]+)/?$"
|
||||
scheme = "https"
|
||||
test = [
|
||||
test = (
|
||||
("http://manga.fascans.com/manga/trinity-seven", {
|
||||
"url": "92699a250ff7d5adcf4b06e6a45b0c05f3426643",
|
||||
"keyword": "afc785c37da7c48e639d3a596e8e0401482b628f",
|
||||
@@ -75,7 +75,7 @@ class FallenangelsMangaExtractor(MangaExtractor):
|
||||
"url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b",
|
||||
"keyword": "2d2a2a5d9ea5925eb9a47bb13d848967f3af086c",
|
||||
}),
|
||||
]
|
||||
)
|
||||
|
||||
def __init__(self, match):
|
||||
MangaExtractor.__init__(self, match)
|
||||
|
||||
Reference in New Issue
Block a user