TODO 后台整理队列

app/schemas/event.py

@@ -3,7 +3,6 @@ from typing import Optional, Dict, Any, List, Set
 
 from pydantic import BaseModel, Field, root_validator
 
-from app.core.context import Context
 from app.schemas import MessageChannel
 
 
@@ -169,7 +168,7 @@ class ResourceSelectionEventData(BaseModel):
 
     # 输出参数
     updated: bool = Field(default=False, description="是否已更新")
-    updated_contexts: Optional[List[Context]] = Field(default=None, description="已更新的资源上下文列表")
+    updated_contexts: Optional[List[Any]] = Field(default=None, description="已更新的资源上下文列表")
     source: Optional[str] = Field(default="未知拦截源", description="拦截源")
 
 

app/schemas/transfer.py

@@ -1,11 +1,11 @@
 from pathlib import Path
-from typing import Optional, List
+from typing import Optional, List, Any, Callable
 
 from pydantic import BaseModel, Field
 
-from app.schemas import TmdbEpisode, MetaInfo, MediaInfo
-from app.schemas.system import TransferDirectoryConf
+from app.schemas import TmdbEpisode
 from app.schemas.file import FileItem
+from app.schemas.system import TransferDirectoryConf
 
 
 class TransferTorrent(BaseModel):
@@ -47,8 +47,9 @@ class TransferTask(BaseModel):
     文件整理任务
     """
     fileitem: Optional[FileItem] = None
-    meta: Optional[MetaInfo] = None
-    mediainfo: Optional[MediaInfo] = None
+    file_path: Optional[Path] = None
+    meta: Optional[Any] = None
+    mediainfo: Optional[Any] = None
     target_directory: Optional[TransferDirectoryConf] = None
     target_storage: Optional[str] = None
     target_path: Optional[Path] = None
@@ -57,6 +58,8 @@ class TransferTask(BaseModel):
     library_type_folder: Optional[bool] = None
     library_category_folder: Optional[bool] = None
     episodes_info: Optional[List[TmdbEpisode]] = None
+    downloader: Optional[str] = None
+    download_hash: Optional[str] = None
 
     def to_dict(self):
         """
@@ -111,13 +114,15 @@ class TransferInfo(BaseModel):
         return dicts
 
 
-class AsyncTransferCallback(BaseModel):
+class TransferQueue(BaseModel):
     """
-    异步整理回调信息
+    异步整理队列信息
     """
     # 任务信息
     task: Optional[TransferTask] = None
-    # 结果信息
+    # 回调函数
+    callback: Optional[Callable] = None
+    # 整理结果
     result: Optional[TransferInfo] = None