Merge 50d01bb4d8 into a02ff884f5

app/run.py

@@ -282,6 +282,7 @@ def get_share_detail():
             regex.get("pattern", ""),
             regex.get("replace", ""),
             regex.get("taskname", ""),
+            regex.get("magic_regex", {}),
         )
         for item in share_detail["list"]:
             file_name = item["file_name"]

app/templates/index.html

@@ -993,7 +993,8 @@
             regex: {
               pattern: this.formData.tasklist[this.fileSelect.index].pattern,
               replace: this.formData.tasklist[this.fileSelect.index].replace,
-              taskname: this.formData.tasklist[this.fileSelect.index].taskname
+              taskname: this.formData.tasklist[this.fileSelect.index].taskname,
+              magic_regex: this.formData.magic_regex,
             }
           }).then(response => {
             if (response.data.success) {

quark_auto_save.py

@@ -521,8 +521,8 @@ class Quark:
     # ↓ 操作函数
 
     # 魔法正则匹配
-    def magic_regex_func(self, pattern, replace, taskname=None):
-        magic_regex = CONFIG_DATA.get("magic_regex") or MAGIC_REGEX or {}
+    def magic_regex_func(self, pattern, replace, taskname=None, magic_regex={}):
+        magic_regex = magic_regex or CONFIG_DATA.get("magic_regex") or MAGIC_REGEX
         keyword = pattern
         if keyword in magic_regex:
             pattern = magic_regex[keyword]["pattern"]
@@ -691,6 +691,17 @@ class Quark:
         to_pdir_fid = self.savepath_fid[savepath]
         dir_file_list = self.ls_dir(to_pdir_fid)
         # print("dir_file_list: ", dir_file_list)
+        # 清空目标文件夹
+        fid_list = [item["fid"] for item in dir_file_list]
+        if fid_list:
+            self.delete(fid_list)
+            recycle_list = self.recycle_list()
+            record_id_list = [
+                item["record_id"] for item in recycle_list if item["fid"] in fid_list
+            ]
+            self.recycle_remove(record_id_list)
+        # 重新获取目标目录文件列表
+        dir_file_list = self.ls_dir(to_pdir_fid)
 
         tree.create_node(
             savepath,