mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-05 23:47:41 +08:00
不整理目录的下载路径可以被下载器获取
修改自动匹配源存储器类型入参
This commit is contained in:
@@ -407,7 +407,7 @@ class TransferChain(ChainBase):
|
|||||||
else:
|
else:
|
||||||
# 未指定目标路径,根据媒体信息获取目标目录
|
# 未指定目标路径,根据媒体信息获取目标目录
|
||||||
target_directory = self.directoryhelper.get_dir(file_mediainfo,
|
target_directory = self.directoryhelper.get_dir(file_mediainfo,
|
||||||
storage=target_storage,
|
storage=file_item.storage,
|
||||||
target_storage=target_storage)
|
target_storage=target_storage)
|
||||||
|
|
||||||
# 执行整理
|
# 执行整理
|
||||||
|
|||||||
@@ -68,12 +68,14 @@ class DirectoryHelper:
|
|||||||
# 电影/电视剧
|
# 电影/电视剧
|
||||||
media_type = media.type.value
|
media_type = media.type.value
|
||||||
dirs = self.get_dirs()
|
dirs = self.get_dirs()
|
||||||
|
# 是否下载器匹配
|
||||||
|
not_downloader: bool = src_path or dest_path or target_storage
|
||||||
# 已匹配的目录
|
# 已匹配的目录
|
||||||
matched_dirs: List[schemas.TransferDirectoryConf] = []
|
matched_dirs: List[schemas.TransferDirectoryConf] = []
|
||||||
# 按照配置顺序查找
|
# 按照配置顺序查找
|
||||||
for d in dirs:
|
for d in dirs:
|
||||||
# 没有启用整理的目录
|
# 没有启用整理的目录
|
||||||
if not d.monitor_type:
|
if not d.monitor_type and not_downloader:
|
||||||
continue
|
continue
|
||||||
# 源存储类型不匹配
|
# 源存储类型不匹配
|
||||||
if storage and d.storage != storage:
|
if storage and d.storage != storage:
|
||||||
|
|||||||
Reference in New Issue
Block a user