Compare commits

..

1 Commits

Author SHA1 Message Date
qingxu fu
b1be05009b 移除冗余代码,修复多用户存档问题 2023-11-20 01:06:19 +08:00

View File

@@ -544,14 +544,16 @@ def find_recent_files(directory):
def file_already_in_downloadzone(file, user_path): def file_already_in_downloadzone(file, user_path):
parent_path = user_path try:
child_path = file parent_path = os.path.abspath(user_path)
if os.path.commonpath([parent_path, child_path]) == parent_path: child_path = os.path.abspath(file)
return True if os.path.samefile(os.path.commonpath([parent_path, child_path]), parent_path):
else: return True
else:
return False
except:
return False return False
def promote_file_to_downloadzone(file, rename_file=None, chatbot=None): def promote_file_to_downloadzone(file, rename_file=None, chatbot=None):
# 将文件复制一份到下载区 # 将文件复制一份到下载区
import shutil import shutil
@@ -564,6 +566,7 @@ def promote_file_to_downloadzone(file, rename_file=None, chatbot=None):
if file_already_in_downloadzone(file, user_path): if file_already_in_downloadzone(file, user_path):
new_path = file new_path = file
else: else:
user_path = get_log_folder(user_name, plugin_name='downloadzone')
if rename_file is None: rename_file = f'{gen_time_str()}-{os.path.basename(file)}' if rename_file is None: rename_file = f'{gen_time_str()}-{os.path.basename(file)}'
new_path = pj(user_path, rename_file) new_path = pj(user_path, rename_file)
# 如果已经存在,先删除 # 如果已经存在,先删除