GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-06-09 17:50:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(event): reorder code execution

Browse Source
This commit is contained in:
InfinityPacer
2025-02-03 00:14:15 +08:00
parent c5a9df88dc
commit 6f24c6ba49
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/modules/filemanager/__init__.py
View File

@@ -837,13 +837,6 @@ class FileManagerModule(_ModuleBase):
:param transfer_type: 整理方式
:param over_flag: 是否覆盖，为True时会先删除再整理
"""
if target_storage == "local" and (target_file.exists() or target_file.is_symlink()):
if not over_flag:
logger.warn(f"文件已存在：{target_file}")
return None, f"{target_file} 已存在"
else:
logger.info(f"正在删除已存在的文件：{target_file}")
target_file.unlink()
logger.info(f"正在整理文件：【{fileitem.storage}】{fileitem.path} 到 【{target_storage}】{target_file}，"
f"操作类型：{transfer_type}")
event_data = TransferInterceptEventData(
@@ -864,6 +857,13 @@ class FileManagerModule(_ModuleBase):
f"Transfer file canceled by event: {event_data.source},"
f"Reason: {event_data.reason}")
return None, event_data.reason
if target_storage == "local" and (target_file.exists() or target_file.is_symlink()):
if not over_flag:
logger.warn(f"文件已存在：{target_file}")
return None, f"{target_file} 已存在"
else:
logger.info(f"正在删除已存在的文件：{target_file}")
target_file.unlink()
new_item, errmsg = self.__transfer_command(fileitem=fileitem,
target_storage=target_storage,
target_file=target_file,