diff --git a/app/run.py b/app/run.py index d13affd..c098e91 100644 --- a/app/run.py +++ b/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"] diff --git a/app/templates/index.html b/app/templates/index.html index a58c9ab..9aab230 100644 --- a/app/templates/index.html +++ b/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) { diff --git a/quark_auto_save.py b/quark_auto_save.py index bc74315..da770c3 100644 --- a/quark_auto_save.py +++ b/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"]