From 1cecf66a843a2fbd24554aaa49b448bf6caf099f Mon Sep 17 00:00:00 2001 From: lededev Date: Sun, 6 Mar 2022 16:08:37 +0800 Subject: [PATCH] support more madou numbers --- WebCrawler/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/WebCrawler/__init__.py b/WebCrawler/__init__.py index f5ce63c..6e431b8 100644 --- a/WebCrawler/__init__.py +++ b/WebCrawler/__init__.py @@ -95,15 +95,17 @@ def get_data_from_json(file_number, oCC): "rj" in lo_file_number or "vj" in lo_file_number ): sources.insert(0, sources.pop(sources.index("dlsite"))) - elif "madou" in sources and ( - re.match(r"^md[0-9]{4}$", lo_file_number) - ): - sources.insert(0, sources.pop(sources.index("madou"))) elif re.match(r"^[a-z0-9]{3,}$", lo_file_number): if "javdb" in sources: sources.insert(0, sources.pop(sources.index("javdb"))) if "xcity" in sources: sources.insert(0, sources.pop(sources.index("xcity"))) + if "madou" in sources: + sources.insert(0, sources.pop(sources.index("madou"))) + elif "madou" in sources and ( + re.match(r"^[a-z0-9]{3,}-[0-9]{2,}$", lo_file_number) + ): + sources.insert(0, sources.pop(sources.index("madou"))) # check sources in func_mapping todel = []