codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
jxxghp 2024-05-23 08:53:20 +08:00
parent 43da33bc50
commit bd1e83ee8a
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/chain/download.py
View File

@ -239,15 +239,21 @@ class DownloadChain(ChainBase):
title="下载失败", role="system") title="下载失败", role="system")
return None return None
if (dir_info.category or dir_info.auto_category) and _media and _media.category: # 一级目录
# 开启下载二级目录 if not dir_info.media_type and dir_info.auto_category:
download_dir = Path(dir_info.path) / _media.category # 一级自动分类
elif _media: download_dir = Path(dir_info.path) / _media.type.value
# 未开启下载二级目录 elif dir_info.media_type:
download_dir = Path(dir_info.path) # 一级自定义分类
download_dir = Path(dir_info.path) / dir_info.media_type
else: else:
# 未识别 # 一级不分类
download_dir = Path(dir_info.path) download_dir = Path(dir_info.path)
# 二级目录
if (dir_info.category or dir_info.auto_category) and _media and _media.category:
# 二级目录自动分类
download_dir = download_dir / _media.category
else: else:
# 自定义下载目录 # 自定义下载目录
download_dir = Path(save_path) download_dir = Path(save_path)

16
app/modules/filetransfer/__init__.py
View File

@ -408,10 +408,20 @@ class FileTransferModule(_ModuleBase):
:target_dir: 媒体库根目录 :target_dir: 媒体库根目录
:typename_dir: 是否加上类型目录 :typename_dir: 是否加上类型目录
""" """
if target_dir.auto_category or target_dir.category: if not target_dir.media_type and target_dir.auto_category:
return Path(target_dir.path) / mediainfo.category # 一级自动分类
download_dir = Path(target_dir.path) / mediainfo.type.value
elif target_dir.media_type:
# 一级自定义分类
download_dir = Path(target_dir.path) / target_dir.media_type
else: else:
return Path(target_dir.path) download_dir = Path(target_dir.path)
if (target_dir.category or target_dir.auto_category) and mediainfo.category:
# 二级自动分类
download_dir = download_dir / mediainfo.category
return download_dir
def transfer_media(self, def transfer_media(self,
in_path: Path, in_path: Path,