From 25da3d16d688f0d2ee0c5cfa5238b0fc1bd259e0 Mon Sep 17 00:00:00 2001 From: Wait Date: Thu, 20 Aug 2020 13:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=89=A5=E5=89=8A=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 如果从配置文件中剔除了某个网站，匹配到规则的网站无法重新排序。 --- core.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core.py b/core.py index 4a7bfbd..55b8cb7 100755 --- a/core.py +++ b/core.py @@ -65,18 +65,20 @@ def get_data_from_json(file_number, filepath, conf: config.Config): # 从JSON # if the input file name matches certain rules, # move some web service to the beginning of the list - if re.match(r"^\d{5,}", file_number) or ( + if "avsox" in sources and (re.match(r"^\d{5,}", file_number) or "HEYZO" in file_number or "heyzo" in file_number or "Heyzo" in file_number ): sources.insert(0, sources.pop(sources.index("avsox"))) - elif re.match(r"\d+\D+", file_number) or ( + elif "fanza" in sources and (re.match(r"\d+\D+", file_number) or "siro" in file_number or "SIRO" in file_number or "Siro" in file_number ): sources.insert(0, sources.pop(sources.index("fanza"))) - elif "fc2" in file_number or "FC2" in file_number: + elif "fc2" in sources and ("fc2" in file_number or "FC2" in file_number + ): sources.insert(0, sources.pop(sources.index("fc2"))) - - elif "RJ" in file_number or "rj" or "VJ" or "vj" in file_number: + elif "dlsite" in sources and ( + "RJ" in file_number or "rj" in file_number or "VJ" in file_number or "vj" in file_number + ): sources.insert(0, sources.pop(sources.index("dlsite"))) json_data = {}