fix directories

app/schemas/filetransfer.py

@@ -1,25 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel
-
-
-class MediaDirectory(BaseModel):
-    """
-    下载目录/媒体库目录
-    """
-    # 类型 download/library
-    type: Optional[str] = None
-    # 别名
-    name: Optional[str] = None
-    # 路径
-    path: Optional[str] = None
-    # 媒体类型 电影/电视剧
-    media_type: Optional[str] = None
-    # 媒体类别 动画电影/国产剧
-    category: Optional[str] = None
-    # 刮削媒体信息
-    scrape: Optional[bool] = False
-    # 自动二级分类，未指定类别时自动分类
-    auto_category: Optional[bool] = False
-    # 优先级
-    priority: Optional[int] = 0

app/schemas/system.py

@@ -47,3 +47,41 @@ class NotificationConf(BaseModel):
     switchs: Optional[list] = []
     # 是否启用
     enabled: Optional[bool] = False
+
+
+class TransferDirectoryConf(BaseModel):
+    """
+    文件整理目录配置
+    """
+    # 名称
+    name: Optional[str] = None
+    # 优先级
+    priority: Optional[int] = 0
+    # 存储
+    storage: Optional[str] = None
+    # 下载目录
+    download_path: Optional[str] = None
+    # 适用媒体类型
+    media_type: Optional[str] = None
+    # 适用媒体类别
+    media_category: Optional[str] = None
+    # 下载类型子目录
+    download_type_folder: Optional[bool] = False
+    # 下载类别子目录
+    download_category_folder: Optional[bool] = False
+    # 监控方式 downloader/monitor，None为不监控
+    monitor_type: Optional[str] = None
+    # 整理方式 move/copy/link/softlink
+    transfer_type: Optional[str] = None
+    # 整理到媒体库目录
+    library_path: Optional[str] = None
+    # 媒体库目录存储
+    library_storage: Optional[str] = None
+    # 智能重命名
+    renaming: Optional[bool] = False
+    # 刮削
+    scraping: Optional[bool] = False
+    # 媒体库类型子目录
+    library_type_folder: Optional[bool] = False
+    # 媒体库类别子目录
+    library_category_folder: Optional[bool] = False

app/schemas/types.py

@@ -64,10 +64,8 @@ class SystemConfigKey(Enum):
     MediaServers = "MediaServers"
     # 消息通知配置
     Notifications = "Notifications"
-    # 下载目录配置
-    DownloadDirectories = "DownloadDirectories"
-    # 媒体库目录配置
-    LibraryDirectories = "LibraryDirectories"
+    # 目录配置
+    Directories = "Directories"
     # 阿里云盘认证参数
     UserAliyunParams = "UserAliyunParams"
     # 115网盘认证参数