diff --git a/app/api/endpoints/transfer.py b/app/api/endpoints/transfer.py index 5e9a3340..f743e755 100644 --- a/app/api/endpoints/transfer.py +++ b/app/api/endpoints/transfer.py @@ -72,6 +72,8 @@ def manual_transfer(path: str, ) # 失败 if not state: + if isinstance(errormsg, list): + errormsg = f"整理完成,{len(errormsg)} 个文件转移失败!" return schemas.Response(success=False, message=errormsg) # 成功 return schemas.Response(success=True) diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 6d97b6b6..96b4dfa1 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -320,7 +320,7 @@ class TransferChain(ChainBase): season: int = None, transfer_type: str = None, epformat: EpisodeFormat = None, - min_filesize: int = 0) -> Tuple[bool, str]: + min_filesize: int = 0) -> Tuple[bool, Union[str, list]]: """ 手动转移 :param in_path: 源文件路径 @@ -496,7 +496,7 @@ class TransferChain(ChainBase): logger.info(f"转移完成,共 {total_num} 个文件,成功 {total_num - len(errmsgs)} 个,失败 {len(errmsgs)} 个") self.progress.end(ProgressKey.FileTransfer) if errmsgs: - return False, "\n".join(errmsgs) + return False, errmsgs return True, "" def __insert_sucess_history(self, src_path: Path, meta: MetaBase,