From 14afed85b0c8e0ee7f5d99cd8e51caf7f7577745 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sat, 29 Jul 2023 08:34:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=B8=8B=E8=BD=BD=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/download.py | 8 ++++---- app/core/config.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/chain/download.py b/app/chain/download.py index d426ae5a..f7a15196 100644 --- a/app/chain/download.py +++ b/app/chain/download.py @@ -105,14 +105,14 @@ class DownloadChain(ChainBase): # 下载目录 if settings.DOWNLOAD_CATEGORY and _media and _media.category: if _media.type == MediaType.MOVIE: - download_dir = Path(settings.DOWNLOAD_MOVIE_PATH) / _media.category + download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) / _media.category else: - download_dir = Path(settings.DOWNLOAD_TV_PATH) / _media.category + download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) / _media.category elif _media: if _media.type == MediaType.MOVIE: - download_dir = Path(settings.DOWNLOAD_MOVIE_PATH) + download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) else: - download_dir = Path(settings.DOWNLOAD_TV_PATH) + download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) else: download_dir = Path(settings.DOWNLOAD_PATH) # 添加下载 diff --git a/app/core/config.py b/app/core/config.py index feff0e6b..d53f0f0a 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -110,9 +110,9 @@ class Settings(BaseSettings): # 下载保存目录，容器内映射路径需要一致 DOWNLOAD_PATH: str = "/downloads" # 电影下载保存目录，容器内映射路径需要一致 - DOWNLOAD_MOVIE_PATH: str = DOWNLOAD_PATH + DOWNLOAD_MOVIE_PATH: str = None # 电视剧下载保存目录，容器内映射路径需要一致 - DOWNLOAD_TV_PATH: str = DOWNLOAD_PATH + DOWNLOAD_TV_PATH: str = None # 下载目录二级分类 DOWNLOAD_CATEGORY: bool = False # 媒体服务器 emby/jellyfin/plex From 90452a892ea7f4f361090001fdddffaedbe4a789 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sat, 29 Jul 2023 08:38:57 +0800 Subject: [PATCH 2/2] fix --- app/chain/download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/chain/download.py b/app/chain/download.py index f7a15196..3eb55fc5 100644 --- a/app/chain/download.py +++ b/app/chain/download.py @@ -107,12 +107,12 @@ class DownloadChain(ChainBase): if _media.type == MediaType.MOVIE: download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) / _media.category else: - download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) / _media.category + download_dir = Path(settings.DOWNLOAD_TV_PATH or settings.DOWNLOAD_PATH) / _media.category elif _media: if _media.type == MediaType.MOVIE: download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) else: - download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) + download_dir = Path(settings.DOWNLOAD_TV_PATH or settings.DOWNLOAD_PATH) else: download_dir = Path(settings.DOWNLOAD_PATH) # 添加下载