From 943b8f42be0ae7ce240a53b1823038a6ce44bdd1 Mon Sep 17 00:00:00 2001 From: Cp0204 Date: Wed, 24 Apr 2024 17:20:50 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=94=AF=E6=8C=81=E5=AD=90?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=AD=A3=E5=88=99=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quark_auto_save.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/quark_auto_save.py b/quark_auto_save.py index c912435..5d048c7 100644 --- a/quark_auto_save.py +++ b/quark_auto_save.py @@ -620,10 +620,15 @@ class Quark: time.sleep(0.500) return response - def do_rename_task(self, task): - dir_file_list = self.ls_dir(self.savepath_fid[task["savepath"]]) + def do_rename_task(self, task, subdir_path=""): + savepath = f"{task['savepath']}{subdir_path}" + dir_file_list = self.ls_dir(self.savepath_fid[savepath]) + dir_file_name_list = [item["file_name"] for item in dir_file_list] is_rename = False for dir_file in dir_file_list: + if dir_file["dir"]: + self.do_rename_task(task, f"{subdir_path}/{dir_file['file_name']}") + break pattern, replace = magic_regex_func(task["pattern"], task["replace"]) if re.search(pattern, dir_file["file_name"]): save_name = ( @@ -631,7 +636,9 @@ class Quark: if replace != "" else dir_file["file_name"] ) - if save_name != dir_file["file_name"]: + if save_name != dir_file["file_name"] and ( + save_name not in dir_file_name_list + ): rename_return = self.rename(dir_file["fid"], save_name) if rename_return["code"] == 0: print(f"重命名：{dir_file['file_name']} → {save_name}")