From fccbe39547d491d322c9ca4e9affe10b91a441d3 Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Sat, 23 Nov 2024 22:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9`target=5Fdirectory`=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/transfer.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 44bc8aa1..206240b3 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -392,13 +392,19 @@ class TransferChain(ChainBase): download_hash = download_file.download_hash # 查询整理目标目录 - if not target_directory and not target_path: + if not target_directory: if src_match: # 按源目录匹配,以便找到更合适的目录配置 - target_directory = self.directoryhelper.get_dir(file_mediainfo, + target_directory = 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, + storage=target_storage, + target_path=target_path, + target_storage=target_storage) else: # 未指定目标路径,根据媒体信息获取目标目录 target_directory = self.directoryhelper.get_dir(file_mediainfo,