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

Merge pull request #3271 from wikrin/v2

Browse Source
This commit is contained in:
jxxghp
2024-11-28 07:22:16 +08:00
committed by GitHub
parent b4e31893ff ca664cb569
commit 48aa0e3d0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/transfer.py
+6 -6
View File
@@ -395,18 +395,18 @@ class TransferChain(ChainBase):
if not target_directory: if not target_directory:
if src_match: 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, storage=file_item.storage,
src_path=file_path, src_path=file_path,
target_storage=target_storage) target_storage=target_storage)
elif target_path: 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, dest_path=target_path,
target_storage=target_storage) target_storage=target_storage)
else: else:
# 未指定目标路径，根据媒体信息获取目标目录 # 未指定目标路径，根据媒体信息获取目标目录
target_directory = self.directoryhelper.get_dir(file_mediainfo, dir_info = self.directoryhelper.get_dir(file_mediainfo,
storage=file_item.storage, storage=file_item.storage,
target_storage=target_storage) target_storage=target_storage)
@@ -414,7 +414,7 @@ class TransferChain(ChainBase):
transferinfo: TransferInfo = self.transfer(fileitem=file_item, transferinfo: TransferInfo = self.transfer(fileitem=file_item,
meta=file_meta, meta=file_meta,
mediainfo=file_mediainfo, mediainfo=file_mediainfo,
target_directory=target_directory, target_directory=target_directory or dir_info,
target_storage=target_storage, target_storage=target_storage,
target_path=target_path, target_path=target_path,
transfer_type=transfer_type, transfer_type=transfer_type,
@@ -693,8 +693,8 @@ class TransferChain(ChainBase):
epformat: EpisodeFormat = None, epformat: EpisodeFormat = None,
min_filesize: int = 0, min_filesize: int = 0,
scrape: bool = None, scrape: bool = None,
library_type_folder: bool = False, library_type_folder: bool = None,
library_category_folder: bool = False, library_category_folder: bool = None,
force: bool = False) -> Tuple[bool, Union[str, list]]: force: bool = False) -> Tuple[bool, Union[str, list]]:
""" """
手动整理，支持复杂条件，带进度显示 手动整理，支持复杂条件，带进度显示