fix 数据库会话管理

app/api/endpoints/download.py

@@ -1,6 +1,7 @@
 from typing import Any, List
 
 from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.orm import Session
 
 from app import schemas
 from app.chain.douban import DoubanChain
@@ -9,6 +10,7 @@ from app.chain.media import MediaChain
 from app.core.context import MediaInfo, Context, TorrentInfo
 from app.core.metainfo import MetaInfo
 from app.core.security import verify_token
+from app.db import get_db
 from app.db.models.user import User
 from app.db.userauth import get_current_active_superuser
 from app.schemas import NotExistMediaInfo, MediaType
@@ -18,18 +20,20 @@ router = APIRouter()
 
 @router.get("/", summary="正在下载", response_model=List[schemas.DownloadingTorrent])
 def read_downloading(
+        db: Session = Depends(get_db),
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     查询正在下载的任务
     """
-    return DownloadChain().downloading()
+    return DownloadChain(db).downloading()
 
 
 @router.post("/", summary="添加下载", response_model=schemas.Response)
 def add_downloading(
         media_in: schemas.MediaInfo,
         torrent_in: schemas.TorrentInfo,
-        current_user: User = Depends(get_current_active_superuser)) -> Any:
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     添加下载任务
     """
@@ -47,7 +51,7 @@ def add_downloading(
         media_info=mediainfo,
         torrent_info=torrentinfo
     )
-    did = DownloadChain().download_single(context=context)
+    did = DownloadChain(db).download_single(context=context)
     return schemas.Response(success=True if did else False, data={
         "download_id": did
     })
@@ -55,6 +59,7 @@ def add_downloading(
 
 @router.post("/notexists", summary="查询缺失媒体信息", response_model=List[NotExistMediaInfo])
 def exists(media_in: schemas.MediaInfo,
+           db: Session = Depends(get_db),
            _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     查询缺失媒体信息
@@ -65,19 +70,19 @@ def exists(media_in: schemas.MediaInfo,
     if media_in.tmdb_id:
         mediainfo.from_dict(media_in.dict())
     elif media_in.douban_id:
-        context = DoubanChain().recognize_by_doubanid(doubanid=media_in.douban_id)
+        context = DoubanChain(db).recognize_by_doubanid(doubanid=media_in.douban_id)
         if context:
             mediainfo = context.media_info
             meta = context.meta_info
     else:
-        context = MediaChain().recognize_by_title(title=f"{media_in.title} {media_in.year}")
+        context = MediaChain(db).recognize_by_title(title=f"{media_in.title} {media_in.year}")
         if context:
             mediainfo = context.media_info
             meta = context.meta_info
     # 查询缺失信息
     if not mediainfo or not mediainfo.tmdb_id:
         raise HTTPException(status_code=404, detail="媒体信息不存在")
-    exist_flag, no_exists = DownloadChain().get_no_exists_info(meta=meta, mediainfo=mediainfo)
+    exist_flag, no_exists = DownloadChain(db).get_no_exists_info(meta=meta, mediainfo=mediainfo)
     if mediainfo.type == MediaType.MOVIE:
         # 电影已存在时返回空列表，存在时返回空对像列表
         return [] if exist_flag else [NotExistMediaInfo()]
@@ -90,31 +95,34 @@ def exists(media_in: schemas.MediaInfo,
 @router.put("/{hashString}/start", summary="开始任务", response_model=schemas.Response)
 def start_downloading(
         hashString: str,
+        db: Session = Depends(get_db),
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     开如下载任务
     """
-    ret = DownloadChain().set_downloading(hashString, "start")
+    ret = DownloadChain(db).set_downloading(hashString, "start")
     return schemas.Response(success=True if ret else False)
 
 
 @router.put("/{hashString}/stop", summary="暂停任务", response_model=schemas.Response)
 def stop_downloading(
         hashString: str,
+        db: Session = Depends(get_db),
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     控制下载任务
     """
-    ret = DownloadChain().set_downloading(hashString, "stop")
+    ret = DownloadChain(db).set_downloading(hashString, "stop")
     return schemas.Response(success=True if ret else False)
 
 
 @router.delete("/{hashString}", summary="删除下载任务", response_model=schemas.Response)
 def remove_downloading(
         hashString: str,
+        db: Session = Depends(get_db),
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     控制下载任务
     """
-    ret = DownloadChain().remove_downloading(hashString)
+    ret = DownloadChain(db).remove_downloading(hashString)
     return schemas.Response(success=True if ret else False)