Compare commits

...

3 Commits

Author SHA1 Message Date
Cp0204
e6b8963069 ️ 优化正则转换逻辑,修复空分享报错
Some checks failed
Docker Publish / build-and-push (push) Has been cancelled
2025-05-20 11:57:47 +08:00
Cp0204
e55433c3f8 Revert "🐛 修复浏览空分享文件夹时报错"
This reverts commit a45663b1f1.
2025-05-20 11:54:46 +08:00
Cp0204
a45663b1f1 🐛 修复浏览空分享文件夹时报错 2025-05-20 11:37:45 +08:00
2 changed files with 15 additions and 14 deletions

View File

@ -310,14 +310,14 @@ def get_share_detail():
dir_file_list = []
dir_filename_list = []
pattern, replace = mr.magic_regex_conv(
task.get("pattern", ""), task.get("replace", "")
)
for share_file in data["list"]:
if share_file["dir"] and task.get("update_subdir", False):
pattern, replace = task["update_subdir"], ""
else:
pattern, replace = mr.magic_regex_conv(
task.get("pattern", ""), task.get("replace", "")
)
if re.search(pattern, share_file["file_name"]):
search_pattern = (
task.get("update_subdir", "") if share_file["dir"] else pattern
)
if re.search(search_pattern, share_file["file_name"]):
# 文件名重命名,目录不重命名
file_name_re = (
share_file["file_name"]

View File

@ -862,18 +862,19 @@ class Quark:
mr = MagicRename(CONFIG_DATA.get("magic_regex", {}))
mr.set_taskname(task["taskname"])
# 魔法正则转换
pattern, replace = mr.magic_regex_conv(
task.get("pattern", ""), task.get("replace", "")
)
# 需保存的文件清单
need_save_list = []
# 添加符合的
for share_file in share_file_list:
if share_file["dir"] and task.get("update_subdir", False):
pattern, replace = task["update_subdir"], ""
else:
pattern, replace = mr.magic_regex_conv(
task.get("pattern", ""), task.get("replace", "")
)
search_pattern = (
task.get("update_subdir", "") if share_file["dir"] else pattern
)
# 正则文件名匹配
if re.search(pattern, share_file["file_name"]):
if re.search(search_pattern, share_file["file_name"]):
# 判断原文件名是否存在,处理忽略扩展名
if not mr.is_exists(
share_file["file_name"],