diff --git a/app/modules/filemanager/__init__.py b/app/modules/filemanager/__init__.py index df0010f7..d788ba34 100644 --- a/app/modules/filemanager/__init__.py +++ b/app/modules/filemanager/__init__.py @@ -920,18 +920,6 @@ class FileManagerModule(_ModuleBase): rename_format = settings.TV_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": # 整理整个目录,一般为蓝光原盘 @@ -1011,12 +999,15 @@ class FileManagerModule(_ModuleBase): overflag = False # 目的操作对象 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: - logger.error(f"目标目录 {new_file.parents[rename_format_level - 1]} 获取失败") + logger.error(f"目标目录 {folder_path} 获取失败") return TransferInfo(success=False, - message=f"目标目录 {new_file.parents[rename_format_level - 1]} 获取失败", + message=f"目标目录 {folder_path} 获取失败", fileitem=fileitem, fail_list=[fileitem.path], transfer_type=transfer_type, @@ -1256,10 +1247,6 @@ class FileManagerModule(_ModuleBase): # 重命名格式 rename_format = settings.TV_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( path=dir_path, @@ -1267,6 +1254,8 @@ class FileManagerModule(_ModuleBase): rename_dict=self.__get_naming_dict(meta=MetaInfo(mediainfo.title), mediainfo=mediainfo) ) + # 计算重命名中的文件夹层数 + rename_format_level = len(rename_format.split("/")) - 1 # 取相对路径的第1层目录 media_path = target_path.parents[rename_format_level - 1] # 检索媒体文件