fix 优化重命名后的媒体文件根路径获取

app/modules/filemanager/__init__.py

@@ -547,17 +547,13 @@ class FileManagerModule(_ModuleBase):
                 rename_dict=handler.get_naming_dict(meta=meta,
                                                     mediainfo=mediainfo)
             )
-            # 计算重命名中的文件夹层数
-            rename_list = rename_format.split("/")
-            rename_format_level = len(rename_list) - 1
-            for level, name in enumerate(rename_list):
-                # 处理特例，有的人重命名第一层是年份、分辨率
-                if "{{title}}" in name:
-                    # 找出含标题的这一层作为扫描路径
-                    rename_format_level -= level
-                    break
-            # 取相对路径的第1层目录
-            media_path = target_path.parents[rename_format_level - 1]
+            # 获取重命名后的媒体文件根路径
+            media_path = DirectoryHelper.get_media_root_path(
+                rename_format, rename_path=target_path
+            )
+            if not media_path:
+                # 忽略
+                continue
             if dir_path.is_relative_to(media_path):
                 # 兜底检查，避免不必要的扫盘
                 logger.warn(f"{media_path} 是媒体库目录 {dir_path} 的父目录，忽略获取媒体文件列表，请检查重命名格式！")

app/modules/filemanager/transhandler.py

@@ -10,6 +10,7 @@ from app.core.context import MediaInfo
 from app.core.event import eventmanager
 from app.core.meta import MetaBase
 from app.core.metainfo import MetaInfoPath
+from app.helper.directory import DirectoryHelper
 from app.helper.message import TemplateHelper
 from app.log import logger
 from app.modules.filemanager.storages import StorageBase
@@ -116,7 +117,19 @@ class TransHandler:
                     template_string=rename_format,
                     rename_dict=self.get_naming_dict(meta=in_meta,
                                                      mediainfo=mediainfo)
-                ).parent
+                )
+                new_path = DirectoryHelper.get_media_root_path(
+                    rename_format, rename_path=new_path
+                )
+                if not new_path:
+                    self.__set_result(
+                        success=False,
+                        message="重命名格式无效",
+                        fileitem=fileitem,
+                        transfer_type=transfer_type,
+                        need_notify=need_notify,
+                    )
+                    return self.result
             else:
                 new_path = target_path / fileitem.name
             # 整理目录
@@ -156,7 +169,7 @@ class TransHandler:
                 if in_meta.begin_episode is None:
                     logger.warn(f"文件 {fileitem.path} 整理失败：未识别到文件集数")
                     self.__set_result(success=False,
-                                      message=f"未识别到文件集数",
+                                      message="未识别到文件集数",
                                       fileitem=fileitem,
                                       fail_list=[fileitem.path],
                                       transfer_type=transfer_type,
@@ -185,9 +198,19 @@ class TransHandler:
                         file_ext=f".{fileitem.extension}"
                     )
                 )
-                # 计算重命名中的文件夹层级
-                rename_format_level = len(rename_format.split("/")) - 1
-                folder_path = new_file.parents[rename_format_level - 1]
+                folder_path = DirectoryHelper.get_media_root_path(
+                    rename_format, rename_path=new_file
+                )
+                if not folder_path:
+                    self.__set_result(
+                        success=False,
+                        message="重命名格式无效",
+                        fileitem=fileitem,
+                        fail_list=[fileitem.path],
+                        transfer_type=transfer_type,
+                        need_notify=need_notify,
+                    )
+                    return self.result
             else:
                 new_file = target_path / fileitem.name
                 folder_path = target_path