Merge remote-tracking branch 'upstream/dev' into feature/db

app/schemas/subscribe.py

@@ -81,43 +81,41 @@ class Subscribe(BaseModel):
         orm_mode = True
 
 
+class SubscribeDownloadFileInfo(BaseModel):
+    # 种子名称
+    torrent_title: Optional[str] = None
+    # 站点名称
+    site_name: Optional[str] = None
+    # 下载器
+    downloader: Optional[str] = None
+    # hash
+    hash: Optional[str] = None
+    # 文件路径
+    file_path: Optional[str] = None
+
+
+class SubscribeLibraryFileInfo(BaseModel):
+    # 存储
+    storage: Optional[str] = "local"
+    # 文件路径
+    file_path: Optional[str] = None
+
+
 class SubscribeEpisodeInfo(BaseModel):
-    # 种子地址
-    torrent: Optional[str] = None
-    # 下载文件路程
-    download_file: Optional[str] = None
-    # 媒体库文件路径
-    library_file: Optional[str] = None
     # 标题
     title: Optional[str] = None
     # 描述
     description: Optional[str] = None
     # 背景图
     backdrop: Optional[str] = None
+    # 下载文件信息
+    download: Optional[List[SubscribeDownloadFileInfo]] = []
+    # 媒体库文件信息
+    library: Optional[List[SubscribeLibraryFileInfo]] = []
 
 
 class SubscrbieInfo(BaseModel):
-    # 订阅ID
-    id: Optional[int] = None
-    # 订阅名称
-    name: Optional[str] = None
-    # 订阅年份
-    year: Optional[str] = None
-    # 订阅类型 电影/电视剧
-    type: Optional[str] = None
-    # 媒体ID
-    tmdbid: Optional[int] = None
-    doubanid: Optional[str] = None
-    bangumiid: Optional[int] = None
-    # 季号
-    season: Optional[int] = None
-    # 海报
-    poster: Optional[str] = None
-    # 背景图
-    backdrop: Optional[str] = None
-    # 评分
-    vote: Optional[int] = 0
-    # 描述
-    description: Optional[str] = None
+    # 订阅信息
+    subscribe: Optional[Subscribe] = None
     # 集信息 {集号: {download: 文件路径，library: 文件路径, backdrop: url, title: 标题, description: 描述}}
-    episodes_info: Optional[Dict[int, SubscribeEpisodeInfo]] = {}
+    episodes: Optional[Dict[int, SubscribeEpisodeInfo]] = {}

app/schemas/system.py

@@ -1,8 +1,26 @@
-from typing import Optional
+from dataclasses import dataclass
+from typing import Optional, Any
 
 from pydantic import BaseModel
 
 
+@dataclass
+class ServiceInfo:
+    """
+    封装服务相关信息的数据类
+    """
+    # 名称
+    name: Optional[str] = None
+    # 实例
+    instance: Optional[Any] = None
+    # 模块
+    module: Optional[Any] = None
+    # 类型
+    type: Optional[str] = None
+    # 配置
+    config: Optional[Any] = None
+
+
 class MediaServerConf(BaseModel):
     """
     媒体服务器配置

app/schemas/types.py

@@ -18,8 +18,10 @@ class TorrentStatus(Enum):
 class EventType(Enum):
     # 插件需要重载
     PluginReload = "plugin.reload"
-    # 插件动作
+    # 触发插件动作
     PluginAction = "plugin.action"
+    # 插件触发事件
+    PluginTriggered = "plugin.triggered"
     # 执行命令
     CommandExcute = "command.excute"
     # 站点已删除