From ca664cb56960741b5b87c2ee96aa2a7e73225922 Mon Sep 17 00:00:00 2001
From: Attente <19653207+wikrin@users.noreply.github.com>
Date: Thu, 28 Nov 2024 05:19:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E6=97=B6`=E5=AA=92=E4=BD=93=E5=BA=93?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95`=E5=8C=B9=E9=85=8D=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/chain/transfer.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/chain/transfer.py b/app/chain/transfer.py
index e2c72653..fe8d5b4e 100644
--- a/app/chain/transfer.py
+++ b/app/chain/transfer.py
@@ -395,18 +395,18 @@ class TransferChain(ChainBase):
             if not target_directory:
                 if src_match:
                     # 按源目录匹配，以便找到更合适的目录配置
-                    target_directory = self.directoryhelper.get_dir(media=file_mediainfo,
+                    dir_info = self.directoryhelper.get_dir(media=file_mediainfo,
                                                                     storage=file_item.storage,
                                                                     src_path=file_path,
                                                                     target_storage=target_storage)
                 elif target_path:
                     # 指定目标路径，`手动整理`场景下使用，忽略源目录匹配，使用指定目录匹配
-                    target_directory = self.directoryhelper.get_dir(media=file_mediainfo,
+                    dir_info = self.directoryhelper.get_dir(media=file_mediainfo,
                                                                     dest_path=target_path,
                                                                     target_storage=target_storage)
                 else:
                     # 未指定目标路径，根据媒体信息获取目标目录
-                    target_directory = self.directoryhelper.get_dir(file_mediainfo,
+                    dir_info = self.directoryhelper.get_dir(file_mediainfo,
                                                                     storage=file_item.storage,
                                                                     target_storage=target_storage)
 
@@ -414,7 +414,7 @@ class TransferChain(ChainBase):
             transferinfo: TransferInfo = self.transfer(fileitem=file_item,
                                                        meta=file_meta,
                                                        mediainfo=file_mediainfo,
-                                                       target_directory=target_directory,
+                                                       target_directory=target_directory or dir_info,
                                                        target_storage=target_storage,
                                                        target_path=target_path,
                                                        transfer_type=transfer_type,
@@ -693,8 +693,8 @@ class TransferChain(ChainBase):
                         epformat: EpisodeFormat = None,
                         min_filesize: int = 0,
                         scrape: bool = None,
-                        library_type_folder: bool = False,
-                        library_category_folder: bool = False,
+                        library_type_folder: bool = None,
+                        library_category_folder: bool = None,
                         force: bool = False) -> Tuple[bool, Union[str, list]]:
         """
         手动整理，支持复杂条件，带进度显示