codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112 from yubanmeiqin9048/main

Browse Source 
add TransferInfo增加目标文件清单
This commit is contained in:
jxxghp
2023-08-14 17:46:06 +08:00
committed by GitHub
parent d4c0d65a54 a02e6d4f68
commit 478552668c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/modules/filetransfer/__init__.py
View File

@ -52,7 +52,7 @@ class FileTransferModule(_ModuleBase):
if isinstance(result, str): if isinstance(result, str):
return TransferInfo(message=result) 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, return TransferInfo(path=path,
target_path=target_path, target_path=target_path,
@ -61,7 +61,8 @@ class FileTransferModule(_ModuleBase):
total_size=file_size, total_size=file_size,
fail_list=fail_list, fail_list=fail_list,
is_bluray=is_bluray, is_bluray=is_bluray,
file_list=file_list) file_list=file_list,
file_list_new=file_list_new)
@staticmethod @staticmethod
def __transfer_command(file_item: Path, target_file: Path, transfer_type: str) -> int: def __transfer_command(file_item: Path, target_file: Path, transfer_type: str) -> int:
@ -378,6 +379,9 @@ class FileTransferModule(_ModuleBase):
# 处理文件清单 # 处理文件清单
file_list = [] file_list = []
# 目标文件清单
file_list_new = []
# 失败文件清单 # 失败文件清单
fail_list = [] fail_list = []
@ -489,6 +493,7 @@ class FileTransferModule(_ModuleBase):
continue continue
# 计算文件数 # 计算文件数
file_list.append(str(transfer_file)) file_list.append(str(transfer_file))
file_list_new.append(str(new_file))
# 计算大小 # 计算大小
total_filesize += transfer_file.stat().st_size total_filesize += transfer_file.stat().st_size
except Exception as err: except Exception as err:
@ -501,7 +506,7 @@ class FileTransferModule(_ModuleBase):
return "\n".join(err_msgs) return "\n".join(err_msgs)
# 蓝光原盘、新路径、处理文件清单、总大小、失败文件列表、错误信息 # 蓝光原盘、新路径、处理文件清单、总大小、失败文件列表、错误信息
return bluray_flag, new_path, file_list, total_filesize, fail_list, "\n".join(err_msgs) return bluray_flag, new_path, file_list, file_list_new, total_filesize, fail_list, "\n".join(err_msgs)
@staticmethod @staticmethod
def __get_naming_dict(meta: MetaBase, mediainfo: MediaInfo, file_ext: str = None) -> dict: def __get_naming_dict(meta: MetaBase, mediainfo: MediaInfo, file_ext: str = None) -> dict:

2
app/schemas/transfer.py
View File

@ -45,6 +45,8 @@ class TransferInfo(BaseModel):
file_count: Optional[int] = 0 file_count: Optional[int] = 0
# 处理文件清单 # 处理文件清单
file_list: Optional[list] = [] file_list: Optional[list] = []
# 目标文件清单
file_list_new: Optional[list] = []
# 总文件大小 # 总文件大小
total_size: Optional[float] = 0 total_size: Optional[float] = 0
# 失败清单 # 失败清单