GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-06 16:07:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #3743

Browse Source
This commit is contained in:
jxxghp
2025-01-17 20:31:23 +08:00
parent a8e161661c
commit 35cc214492
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/filemanager/__init__.py
+8 -19
View File
@@ -920,18 +920,6 @@ class FileManagerModule(_ModuleBase):
rename_format = settings.TV_RENAME_FORMAT \ rename_format = settings.TV_RENAME_FORMAT \
if mediainfo.type == MediaType.TV else settings.MOVIE_RENAME_FORMAT if mediainfo.type == MediaType.TV else settings.MOVIE_RENAME_FORMAT
# 计算重命名中的文件夹层数
rename_format_level = len(rename_format.split("/")) - 1
if rename_format_level < 1:
# 重命名格式不合法
logger.error(f"重命名格式不合法：{rename_format}")
return TransferInfo(success=False,
message=f"重命名格式不合法",
fileitem=fileitem,
transfer_type=transfer_type,
need_notify=need_notify)
# 判断是否为文件夹 # 判断是否为文件夹
if fileitem.type == "dir": if fileitem.type == "dir":
# 整理整个目录，一般为蓝光原盘 # 整理整个目录，一般为蓝光原盘
@@ -1011,12 +999,15 @@ class FileManagerModule(_ModuleBase):
overflag = False overflag = False
# 目的操作对象 # 目的操作对象
target_oper: StorageBase = self.__get_storage_oper(target_storage) target_oper: StorageBase = self.__get_storage_oper(target_storage)
# 计算重命名中的文件夹层级
rename_format_level = len(rename_format.split("/")) - 1
folder_path = new_file.parents[rename_format_level - 1]
# 目标目录 # 目标目录
target_diritem = target_oper.get_folder(new_file.parents[rename_format_level - 1]) target_diritem = target_oper.get_folder(folder_path)
if not target_diritem: if not target_diritem:
logger.error(f"目标目录 {new_file.parents[rename_format_level - 1]} 获取失败") logger.error(f"目标目录 {folder_path} 获取失败")
return TransferInfo(success=False, return TransferInfo(success=False,
message=f"目标目录 {new_file.parents[rename_format_level - 1]} 获取失败", message=f"目标目录 {folder_path} 获取失败",
fileitem=fileitem, fileitem=fileitem,
fail_list=[fileitem.path], fail_list=[fileitem.path],
transfer_type=transfer_type, transfer_type=transfer_type,
@@ -1256,10 +1247,6 @@ class FileManagerModule(_ModuleBase):
# 重命名格式 # 重命名格式
rename_format = settings.TV_RENAME_FORMAT \ rename_format = settings.TV_RENAME_FORMAT \
if mediainfo.type == MediaType.TV else settings.MOVIE_RENAME_FORMAT if mediainfo.type == MediaType.TV else settings.MOVIE_RENAME_FORMAT
# 计算重命名中的文件夹层数
rename_format_level = len(rename_format.split("/")) - 1
if rename_format_level < 1:
continue
# 获取路径（重命名路径） # 获取路径（重命名路径）
target_path = self.get_rename_path( target_path = self.get_rename_path(
path=dir_path, path=dir_path,
@@ -1267,6 +1254,8 @@ class FileManagerModule(_ModuleBase):
rename_dict=self.__get_naming_dict(meta=MetaInfo(mediainfo.title), rename_dict=self.__get_naming_dict(meta=MetaInfo(mediainfo.title),
mediainfo=mediainfo) mediainfo=mediainfo)
) )
# 计算重命名中的文件夹层数
rename_format_level = len(rename_format.split("/")) - 1
# 取相对路径的第1层目录 # 取相对路径的第1层目录
media_path = target_path.parents[rename_format_level - 1] media_path = target_path.parents[rename_format_level - 1]
# 检索媒体文件 # 检索媒体文件