From c7fe0a15d98894dab61e9659aecf1feeda67b1ab Mon Sep 17 00:00:00 2001
From: yubanmeiqin9048 <1414603524@qq.com>
Date: Mon, 14 Aug 2023 09:47:50 +0800
Subject: [PATCH] =?UTF-8?q?add=20TransferInfo=E5=A2=9E=E5=8A=A0=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E6=96=87=E4=BB=B6=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/modules/filetransfer/__init__.py | 9 +++++++--
 app/schemas/transfer.py              | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/modules/filetransfer/__init__.py b/app/modules/filetransfer/__init__.py
index ed257d63..3bee655c 100644
--- a/app/modules/filetransfer/__init__.py
+++ b/app/modules/filetransfer/__init__.py
@@ -52,7 +52,7 @@ class FileTransferModule(_ModuleBase):
         if isinstance(result, str):
             return TransferInfo(message=result)
         # 解包结果
-        is_bluray, target_path, file_list, file_size, fail_list, msg = result
+        is_bluray, target_path, file_list, file_list_new, file_size, fail_list, msg = result
         # 返回
         return TransferInfo(path=path,
                             target_path=target_path,
@@ -61,7 +61,8 @@ class FileTransferModule(_ModuleBase):
                             total_size=file_size,
                             fail_list=fail_list,
                             is_bluray=is_bluray,
-                            file_list=file_list)
+                            file_list=file_list,
+                            file_list_new=file_list_new)
 
     @staticmethod
     def __transfer_command(file_item: Path, target_file: Path, transfer_type: str) -> int:
@@ -378,6 +379,9 @@ class FileTransferModule(_ModuleBase):
         # 处理文件清单
         file_list = []
 
+        # 目标文件清单
+        file_list_new = []
+
         # 失败文件清单
         fail_list = []
 
@@ -489,6 +493,7 @@ class FileTransferModule(_ModuleBase):
                         continue
                     # 计算文件数
                     file_list.append(str(transfer_file))
+                    file_list_new.append(str(new_file))
                     # 计算大小
                     total_filesize += transfer_file.stat().st_size
                 except Exception as err:
diff --git a/app/schemas/transfer.py b/app/schemas/transfer.py
index b04db74d..26cbaa94 100644
--- a/app/schemas/transfer.py
+++ b/app/schemas/transfer.py
@@ -45,6 +45,8 @@ class TransferInfo(BaseModel):
     file_count: Optional[int] = 0
     # 处理文件清单
     file_list: Optional[list] = []
+    # 目标文件清单
+    file_list_new: Optional[list] = []
     # 总文件大小
     total_size: Optional[float] = 0
     # 失败清单