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

fix #3141

Browse Source
This commit is contained in:
jxxghp
2024-11-17 14:14:13 +08:00
parent 4c86a4da5f
commit 4636c7ada7
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/download.py
+20 -24
View File
@@ -252,35 +252,31 @@ class DownloadChain(ChainBase):
# 下载目录 # 下载目录
if save_path: if save_path:
# 有自定义下载目录时，尝试匹配目录配置 # 下载目录使用自定义的
dir_info = self.directoryhelper.get_dir(_media, src_path=Path(save_path)) download_dir = Path(save_path)
else: else:
# 根据媒体信息查询下载目录配置 # 根据媒体信息查询下载目录配置
dir_info = self.directoryhelper.get_dir(_media) dir_info = self.directoryhelper.get_dir(_media)
# 拼装子目录
if dir_info:
# 一级目录
if not dir_info.media_type and dir_info.download_type_folder:
# 一级自动分类
download_dir = Path(dir_info.download_path) / _media.type.value
else:
# 一级不分类
download_dir = Path(dir_info.download_path)
# 拼装子目录 # 二级目录
if dir_info: if not dir_info.media_category and dir_info.download_category_folder and _media and _media.category:
# 一级目录 # 二级自动分类
if not dir_info.media_type and dir_info.download_type_folder: download_dir = download_dir / _media.category
# 一级自动分类
download_dir = Path(dir_info.download_path) / _media.type.value
else: else:
# 一级不分类 # 未找到下载目录，且没有自定义下载目录
download_dir = Path(dir_info.download_path) logger.error(f"未找到下载目录：{_media.type.value} {_media.title_year}")
self.messagehelper.put(f"{_media.type.value} {_media.title_year} 未找到下载目录！",
# 二级目录 title="下载失败", role="system")
if not dir_info.media_category and dir_info.download_category_folder and _media and _media.category: return None
# 二级自动分类
download_dir = download_dir / _media.category
elif save_path:
# 自定义下载目录
download_dir = Path(save_path)
else:
# 未找到下载目录，且没有自定义下载目录
logger.error(f"未找到下载目录：{_media.type.value} {_media.title_year}")
self.messagehelper.put(f"{_media.type.value} {_media.title_year} 未找到下载目录！",
title="下载失败", role="system")
return None
# 添加下载 # 添加下载
result: Optional[tuple] = self.download(content=content, result: Optional[tuple] = self.download(content=content,