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

fix #159

Browse Source
This commit is contained in:
jxxghp 2023-08-18 11:27:39 +08:00
parent e44409a7db
commit 19ca957283
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,14 +410,16 @@ class FileTransferModule(_ModuleBase):
transfer_files: List[Path] = SystemUtils.list_files_with_extensions(in_path, settings.RMT_MEDIAEXT) transfer_files: List[Path] = SystemUtils.list_files_with_extensions(in_path, settings.RMT_MEDIAEXT)
if len(transfer_files) == 0: if len(transfer_files) == 0:
return TransferInfo(message=f"{in_path} 目录下没有找到可转移的文件") return TransferInfo(message=f"{in_path} 目录下没有找到可转移的文件")
if not file_meta:
# 识别目录名称，不包括后缀 # 识别目录名称，不包括后缀
meta = MetaInfo(in_path.stem) meta = MetaInfo(in_path.stem)
else:
meta = file_meta
# 目的路径 # 目的路径
new_path = target_dir / self.get_rename_path( new_path = target_dir / (self.get_rename_path(
template_string=rename_format, template_string=rename_format,
rename_dict=self.__get_naming_dict(meta=meta, rename_dict=self.__get_naming_dict(meta=meta,
mediainfo=mediainfo) mediainfo=mediainfo)).parents[-2].name)
).parents[-2].name
# 转移所有文件 # 转移所有文件
for transfer_file in transfer_files: for transfer_file in transfer_files:
try: try:
@ -445,8 +447,7 @@ class FileTransferModule(_ModuleBase):
mediainfo=mediainfo, mediainfo=mediainfo,
file_ext=transfer_file.suffix) file_ext=transfer_file.suffix)
) )
# 重新修正目的路径
new_path = new_path.parents[-2].name
# 判断是否要覆盖 # 判断是否要覆盖
overflag = False overflag = False
if new_file.exists(): if new_file.exists():