Merge remote-tracking branch 'origin/main'

jxxghp · Jul 29, 2023 · e4992ea · e4992ea
2 parents 29aa1bc + 110c4f6
commit e4992ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ docker pull jxxghp/moviepilot:latest
 - **API_TOKEN：** API密钥，默认`moviepilot`，在媒体服务器Webhook、微信回调等地址配置中需要加上`?token=`该值，建议修改为复杂字符串
 - **PROXY_HOST：** 网络代理（可选），访问themoviedb需要使用代理访问，格式为`http(s)://ip:port`
 - **TMDB_API_DOMAIN：** TMDB API地址，默认`api.themoviedb.org`，也可配置为`api.tmdb.org`或其它中转代理服务地址，能连通即可
-- **DOWNLOAD_PATH：** 下载保存目录，**注意：需要将`moviepilot`及`下载器`的映射路径与宿主机`真实路径`保持一致**，例如群晖中下载路程径为`/volume1/downloads`，则需要将`moviepilot`及`下载器`的映射路径均设置为`/volume1/downloads`，否则会导致下载文件无法转移
+- **DOWNLOAD_PATH：** 下载保存目录，**注意：需要将`moviepilot`及`下载器`的映射路径保持一致**，否则会导致下载文件无法转移
 - **DOWNLOAD_MOVIE_PATH：** 电影下载保存目录，**必须是DOWNLOAD_PATH的下级路径**，不设置则下载到DOWNLOAD_PATH
 - **DOWNLOAD_TV_PATH：** 电视剧下载保存目录，**必须是DOWNLOAD_PATH的下级路径**，不设置则下载到DOWNLOAD_PATH
 - **DOWNLOAD_CATEGORY：** 下载二级分类开关，`true`/`false`，默认`false`，开启后会根据配置`category.yaml`自动在下载目录下建立二级目录分类
@@ -211,7 +211,7 @@ docker pull jxxghp/moviepilot:latest
 
 **注意**
 
-1) 容器首次启动需要下载浏览器内核，根据网络情况可能需要较长时间，此时无法登录。可映射`/root`目录避免容器重置后重新触发浏览器内核下载。
+1) 容器首次启动需要下载浏览器内核，根据网络情况可能需要较长时间，此时无法登录。可映射`/moviepilot`目录避免容器重置后重新触发浏览器内核下载。
 2) 使用反向代理时，需要添加以下配置，否则可能会导致部分功能无法访问（`ip:port`修改为实际值）：
 ```nginx configuration
 location / {

diff --git a/app/chain/download.py b/app/chain/download.py
@@ -105,14 +105,14 @@ def download_single(self, context: Context, torrent_file: Path = None,
         # 下载目录
         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_TV_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_TV_PATH or settings.DOWNLOAD_PATH)
         else:
             download_dir = Path(settings.DOWNLOAD_PATH)
         # 添加下载

diff --git 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