diff --git a/app/api/endpoints/transfer.py b/app/api/endpoints/transfer.py index fff97db8..35f9b21b 100644 --- a/app/api/endpoints/transfer.py +++ b/app/api/endpoints/transfer.py @@ -57,7 +57,7 @@ def manual_transfer(path: str = None, # 源路径 in_path = Path(history.src) # 目的路径 - if history.dest: + if history.dest and str(history.dest) != "None": # 删除旧的已整理文件 TransferChain(db).delete_files(Path(history.dest)) if not target: @@ -67,8 +67,10 @@ def manual_transfer(path: str = None, else: return schemas.Response(success=False, message=f"缺少参数:path/logid") - if target: + if target and target != "None": target = Path(target) + else: + target = None # 类型 mtype = MediaType(type_name) if type_name else None diff --git a/app/db/transferhistory_oper.py b/app/db/transferhistory_oper.py index ba50db5b..e0ad09e2 100644 --- a/app/db/transferhistory_oper.py +++ b/app/db/transferhistory_oper.py @@ -119,7 +119,7 @@ class TransferHistoryOper(DbOper): """ self.add_force( src=str(src_path), - dest=str(transferinfo.target_path), + dest=str(transferinfo.target_path or ''), mode=mode, type=mediainfo.type.value, category=mediainfo.category, @@ -145,7 +145,7 @@ class TransferHistoryOper(DbOper): if mediainfo and transferinfo: his = self.add_force( src=str(src_path), - dest=str(transferinfo.target_path), + dest=str(transferinfo.target_path or ''), mode=mode, type=mediainfo.type.value, category=mediainfo.category,