mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-07-21 04:31:59 +08:00
feat(transfer): 增加手动整理预览模式（preview mode）
- ManualTransferItem/TransferTask 增加 preview 字段，支持同一接口双模式 - /api/v1/transfer/manual 透传 preview，预览时返回结构化结果不落盘 - ChainBase.transfer 增加 preview 参数并透传到 run_module - TransferChain.do_transfer 预览分支复用完整命名/覆盖判定逻辑（dry-run） - TransferChain.do_transfer 预览结束后显式 finish_task/fail_task，避免任务残留 running 状态导致重复预览失败 - TransHandler.transfer_media 预览分支跳过实际 copy/move/link/delete，仅返回目标路径 - FileManagerModule.transfer 透传 preview 参数 - 修复 /manual 失败分支 dict 类型导致 Response.message 校验错误 - 兼容性：preview 字段有默认值，旧客户端不传参时行为不变
This commit is contained in:
album
@@ -406,7 +406,8 @@ class FileManagerModule(_ModuleBase):
|
||||
transfer_type: Optional[str] = None, scrape: Optional[bool] = None,
|
||||
library_type_folder: Optional[bool] = None, library_category_folder: Optional[bool] = None,
|
||||
episodes_info: List[TmdbEpisode] = None,
|
||||
source_oper: Callable = None, target_oper: Callable = None) -> TransferInfo:
|
||||
source_oper: Callable = None, target_oper: Callable = None,
|
||||
preview: Optional[bool] = False) -> TransferInfo:
|
||||
"""
|
||||
文件整理
|
||||
:param fileitem: 文件信息
|
||||
@@ -522,6 +523,7 @@ class FileManagerModule(_ModuleBase):
|
||||
need_notify=need_notify,
|
||||
overwrite_mode=overwrite_mode,
|
||||
episodes_info=episodes_info,
|
||||
preview=preview,
|
||||
source_oper=source_oper,
|
||||
target_oper=target_oper)
|
||||
|
||||
|
||||
@@ -78,6 +78,7 @@ class TransHandler:
|
||||
need_notify: Optional[bool] = True,
|
||||
overwrite_mode: Optional[str] = None,
|
||||
episodes_info: List[TmdbEpisode] = None,
|
||||
preview: Optional[bool] = False,
|
||||
) -> TransferInfo:
|
||||
"""
|
||||
识别并整理一个文件或者一个目录下的所有文件
|
||||
@@ -94,6 +95,7 @@ class TransHandler:
|
||||
:param need_notify: 是否需要通知
|
||||
:param overwrite_mode: 覆盖模式
|
||||
:param episodes_info: 当前季的全部集信息
|
||||
:param preview: 是否仅预览
|
||||
:return: TransferInfo、错误信息
|
||||
"""
|
||||
|
||||
@@ -158,6 +160,27 @@ class TransHandler:
|
||||
return result
|
||||
else:
|
||||
new_path = target_path / fileitem.name
|
||||
if preview:
|
||||
preview_diritem = FileItem(
|
||||
storage=target_storage,
|
||||
path=new_path.as_posix(),
|
||||
name=new_path.name,
|
||||
basename=new_path.stem,
|
||||
type="dir",
|
||||
)
|
||||
self.__update_result(
|
||||
result=result,
|
||||
success=True,
|
||||
fileitem=fileitem,
|
||||
target_item=preview_diritem,
|
||||
target_diritem=preview_diritem,
|
||||
file_list=[fileitem.path],
|
||||
file_list_new=[new_path.as_posix()],
|
||||
need_scrape=need_scrape,
|
||||
need_notify=False,
|
||||
transfer_type=transfer_type,
|
||||
)
|
||||
return result
|
||||
# 原盘大小只计算STREAM目录内的文件大小
|
||||
if stream_fileitem := source_oper.get_item(
|
||||
Path(fileitem.path) / "BDMV" / "STREAM"
|
||||
@@ -267,19 +290,28 @@ class TransHandler:
|
||||
folder_path = target_path
|
||||
|
||||
# 目标目录
|
||||
target_diritem = target_oper.get_folder(folder_path)
|
||||
if not target_diritem:
|
||||
logger.error(f"目标目录 {folder_path} 获取失败")
|
||||
self.__update_result(
|
||||
result=result,
|
||||
success=False,
|
||||
message=f"目标目录 {folder_path} 获取失败",
|
||||
fileitem=fileitem,
|
||||
fail_list=[fileitem.path],
|
||||
transfer_type=transfer_type,
|
||||
need_notify=need_notify,
|
||||
if preview:
|
||||
target_diritem = FileItem(
|
||||
storage=target_storage,
|
||||
path=folder_path.as_posix(),
|
||||
name=folder_path.name,
|
||||
basename=folder_path.stem,
|
||||
type="dir",
|
||||
)
|
||||
return result
|
||||
else:
|
||||
target_diritem = target_oper.get_folder(folder_path)
|
||||
if not target_diritem:
|
||||
logger.error(f"目标目录 {folder_path} 获取失败")
|
||||
self.__update_result(
|
||||
result=result,
|
||||
success=False,
|
||||
message=f"目标目录 {folder_path} 获取失败",
|
||||
fileitem=fileitem,
|
||||
fail_list=[fileitem.path],
|
||||
transfer_type=transfer_type,
|
||||
need_notify=need_notify,
|
||||
)
|
||||
return result
|
||||
|
||||
# 判断是否要覆盖，附加文件强制覆盖
|
||||
overflag = False
|
||||
@@ -407,11 +439,40 @@ class TransHandler:
|
||||
logger.info(
|
||||
f"当前整理覆盖模式设置为 {overwrite_mode}，仅保留最新版本，正在删除已有版本文件 ..."
|
||||
)
|
||||
self.__delete_version_files(target_oper, new_file)
|
||||
if not preview:
|
||||
self.__delete_version_files(target_oper, new_file)
|
||||
else:
|
||||
# 附加文件 总是需要覆盖
|
||||
overflag = True
|
||||
|
||||
if preview:
|
||||
target_item = target_oper.get_item(new_file)
|
||||
if not target_item:
|
||||
target_item = FileItem(
|
||||
storage=target_storage,
|
||||
path=new_file.as_posix(),
|
||||
name=new_file.name,
|
||||
basename=new_file.stem,
|
||||
type="file",
|
||||
extension=new_file.suffix.lstrip("."),
|
||||
size=fileitem.size,
|
||||
)
|
||||
self.__update_result(
|
||||
result=result,
|
||||
success=True,
|
||||
fileitem=fileitem,
|
||||
target_item=target_item,
|
||||
target_diritem=target_diritem,
|
||||
file_list=[fileitem.path],
|
||||
file_list_new=[new_file.as_posix()],
|
||||
file_count=1,
|
||||
total_size=fileitem.size or 0,
|
||||
need_scrape=need_scrape,
|
||||
transfer_type=transfer_type,
|
||||
need_notify=False,
|
||||
)
|
||||
return result
|
||||
|
||||
# 整理文件
|
||||
new_item, err_msg = self.__transfer_file(
|
||||
fileitem=fileitem,
|
||||
|
||||
Reference in New Issue
Block a user