From 5258b52f4bc5af9c1a7be9b3773eace60e2793ff Mon Sep 17 00:00:00 2001 From: yoshiko2 Date: Wed, 5 May 2021 21:09:48 +0800 Subject: [PATCH] Revert "Adjust source order for single threading" This reverts commit 4778e6360e103570dfbf1ade6aeeeaafc5038d90. --- core.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core.py b/core.py index 08e3294..89bce82 100755 --- a/core.py +++ b/core.py @@ -70,12 +70,11 @@ 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 "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"))) - if "mgstage" in sources and (re.match(r"\d+\D+-", 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 "mgstage" 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("mgstage")))