Merge pull request #27 from shininome/aio_beta

0.1

Author: shinonomeow

backend/requirements-dev.txt

@@ -2,4 +2,5 @@
 ruff
 black
 pre-commit
-pytest
+pytest
+pytest-asyncio

backend/requirements.txt

@@ -7,9 +7,7 @@ fastapi==0.97.0
 h11==0.14.0
 idna==3.4
 pydantic~=1.10
-PySocks==1.7.1
-qbittorrent-api==2023.9.53
-requests==2.31.0
+httpx[http2,socks]==0.25.0
 six==1.16.0
 sniffio==1.3.0
 soupsieve==2.4.1

backend/src/main.py

@@ -3,13 +3,15 @@
 
 import uvicorn
 from fastapi import FastAPI, Request
-from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
+from fastapi.responses import FileResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
+
 from module.api import v1
 from module.conf import VERSION, settings, setup_logger
+from module.utils import load_image
 
-setup_logger(reset=True)
+setup_logger()
 logger = logging.getLogger(__name__)
 uvicorn_logging_config = {
     "version": 1,
@@ -39,8 +41,11 @@ def create_app() -> FastAPI:
 
 
 @app.get("/posters/{path:path}", tags=["posters"])
-def posters(path: str):
-    return FileResponse(f"data/posters/{path}")
+async def posters(path: str):
+    post_path = f"data/posters/{path}"
+    if not os.path.exists(post_path):
+        await load_image(path)
+    return FileResponse(post_path)
 
 
 if VERSION != "DEV_VERSION":
@@ -57,7 +62,9 @@ def html(request: Request, path: str):
         else:
             context = {"request": request}
             return templates.TemplateResponse("index.html", context)
+
 else:
+
     @app.get("/", status_code=302, tags=["html"])
     def index():
         return RedirectResponse("/docs")

backend/src/module/api/__init__.py

@@ -8,7 +8,7 @@
 from .rss import router as rss_router
 from .search import router as search_router
 
-__all__ = "v1"
+__all__ = ["v1"]
 
 # API 1.0
 v1 = APIRouter(prefix="/v1")

backend/src/module/api/auth.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Depends
 from fastapi.responses import JSONResponse, Response
 from fastapi.security import OAuth2PasswordRequestForm
 

backend/src/module/api/bangumi.py

@@ -1,9 +1,11 @@
 from fastapi import APIRouter, Depends
 from fastapi.responses import JSONResponse
+from sqlalchemy.util.concurrency import asyncio
 
+from module.database import Database, engine
 from module.manager import TorrentManager
-from module.models import APIResponse, Bangumi, BangumiUpdate
-from module.security.api import UNAUTHORIZED, get_current_user
+from module.models import APIResponse, Bangumi, BangumiUpdate, ResponseModel
+from module.security.api import get_current_user
 
 from .response import u_response
 
@@ -20,8 +22,8 @@ def str_to_list(data: Bangumi):
     "/get/all", response_model=list[Bangumi], dependencies=[Depends(get_current_user)]
 )
 async def get_all_data():
-    with TorrentManager() as manager:
-        return manager.bangumi.search_all()
+    with Database() as db:
+        return db.bangumi.search_all()
 
 
 @router.get(
@@ -30,8 +32,7 @@ async def get_all_data():
     dependencies=[Depends(get_current_user)],
 )
 async def get_data(bangumi_id: str):
-    with TorrentManager() as manager:
-        resp = manager.search_one(bangumi_id)
+    resp = TorrentManager().search_one(bangumi_id)
     return resp
 
 
@@ -44,8 +45,22 @@ async def update_rule(
     bangumi_id: int,
     data: BangumiUpdate,
 ):
-    with TorrentManager() as manager:
-        resp = manager.update_rule(bangumi_id, data)
+    resp = await TorrentManager().update_rule(bangumi_id, data)
+    if resp:
+        resp = ResponseModel(
+            status_code=200,
+            status=True,
+            msg_en=f"Update rule for {data.official_title}",
+            msg_zh=f"更新 {data.official_title} 规则",
+        )
+
+    else:
+        resp = ResponseModel(
+            status_code=406,
+            status=False,
+            msg_en=f"Can't find data with {bangumi_id}",
+            msg_zh=f"无法找到 id {bangumi_id} 的数据",
+        )
     return u_response(resp)
 
 
@@ -55,8 +70,21 @@ async def update_rule(
     dependencies=[Depends(get_current_user)],
 )
 async def delete_rule(bangumi_id: str, file: bool = False):
-    with TorrentManager() as manager:
-        resp = manager.delete_rule(bangumi_id, file)
+    data,torrent_message = await TorrentManager().delete_rule(bangumi_id, file)
+    if data:
+        resp =  ResponseModel(
+            status_code=200,
+            status=True,
+            msg_en=f"Delete rule for {data.official_title}. {torrent_message.msg_en if file else ''}",
+            msg_zh=f"删除 {data.official_title} 规则。{torrent_message.msg_zh if file else ''}",
+        )
+    else:
+        resp = ResponseModel(
+                status_code=406,
+                status=False,
+                msg_en=f"Can't find id {bangumi_id}",
+                msg_zh=f"无法找到 id {bangumi_id}",
+            )
     return u_response(resp)
 
 
@@ -66,9 +94,12 @@ async def delete_rule(bangumi_id: str, file: bool = False):
     dependencies=[Depends(get_current_user)],
 )
 async def delete_many_rule(bangumi_id: list, file: bool = False):
-    with TorrentManager() as manager:
-        for i in bangumi_id:
-            resp = manager.delete_rule(i, file)
+    tasks = []
+    for i in bangumi_id:
+        tasks.append(TorrentManager().delete_rule(i, file))
+
+    resp = await asyncio.gather(*tasks)
+    resp = resp[0]
     return u_response(resp)
 
 
@@ -78,8 +109,7 @@ async def delete_many_rule(bangumi_id: list, file: bool = False):
     dependencies=[Depends(get_current_user)],
 )
 async def disable_rule(bangumi_id: str, file: bool = False):
-    with TorrentManager() as manager:
-        resp = manager.disable_rule(bangumi_id, file)
+    resp = await TorrentManager().disable_rule(bangumi_id, file)
     return u_response(resp)
 
 
@@ -89,9 +119,11 @@ async def disable_rule(bangumi_id: str, file: bool = False):
     dependencies=[Depends(get_current_user)],
 )
 async def disable_many_rule(bangumi_id: list, file: bool = False):
-    with TorrentManager() as manager:
-        for i in bangumi_id:
-            resp = manager.disable_rule(i, file)
+    tasks = []
+    for i in bangumi_id:
+        tasks.append(TorrentManager().disable_rule(i, file))
+    resp = await asyncio.gather(*tasks)
+    resp = resp[-1]
     return u_response(resp)
 
 
@@ -101,8 +133,7 @@ async def disable_many_rule(bangumi_id: list, file: bool = False):
     dependencies=[Depends(get_current_user)],
 )
 async def enable_rule(bangumi_id: str):
-    with TorrentManager() as manager:
-        resp = manager.enable_rule(bangumi_id)
+    resp = await TorrentManager().enable_rule(bangumi_id)
     return u_response(resp)
 
 
@@ -112,28 +143,30 @@ async def enable_rule(bangumi_id: str):
     dependencies=[Depends(get_current_user)],
 )
 async def refresh_poster():
-    with TorrentManager() as manager:
-        resp = manager.refresh_poster()
+    resp = await TorrentManager().refresh_poster()
     return u_response(resp)
 
+
 @router.get(
     path="/refresh/poster/{bangumi_id}",
     response_model=APIResponse,
     dependencies=[Depends(get_current_user)],
 )
-async def refresh_poster(bangumi_id: int):
-    with TorrentManager() as manager:
-        resp = manager.refind_poster(bangumi_id)
+async def refresh_single_poster(bangumi_id: int):
+    resp = await TorrentManager().refind_poster(bangumi_id)
     return u_response(resp)
 
 
 @router.get(
     "/reset/all", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
 async def reset_all():
-    with TorrentManager() as manager:
-        manager.bangumi.delete_all()
+    with Database(engine) as db:
+        db.bangumi.delete_all()
         return JSONResponse(
             status_code=200,
-            content={"msg_en": "Reset all rules successfully.", "msg_zh": "重置所有规则成功。"},
+            content={
+                "msg_en": "Reset all rules successfully.",
+                "msg_zh": "重置所有规则成功。",
+            },
         )

backend/src/module/api/config.py

@@ -5,7 +5,7 @@
 
 from module.conf import settings
 from module.models import APIResponse, Config
-from module.security.api import UNAUTHORIZED, get_current_user
+from module.security.api import get_current_user
 
 router = APIRouter(prefix="/config", tags=["config"])
 logger = logging.getLogger(__name__)

backend/src/module/api/log.py

@@ -3,7 +3,7 @@
 
 from module.conf import LOG_PATH
 from module.models import APIResponse
-from module.security.api import UNAUTHORIZED, get_current_user
+from module.security.api import get_current_user
 
 router = APIRouter(prefix="/log", tags=["log"])
 

backend/src/module/api/program.py

@@ -19,20 +19,21 @@
 
 @router.on_event("startup")
 async def startup():
-    program.startup()
+    await program.startup()
 
 
 @router.on_event("shutdown")
 async def shutdown():
-    program.stop()
+    await program.stop()
 
 
 @router.get(
     "/restart", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
 async def restart():
     try:
-        resp = program.restart()
+        # resp = await program.restart()
+        resp = await program.restart()
         return u_response(resp)
     except Exception as e:
         logger.debug(e)
@@ -51,7 +52,7 @@ async def restart():
 )
 async def start():
     try:
-        resp = program.start()
+        resp = await program.start()
         return u_response(resp)
     except Exception as e:
         logger.debug(e)
@@ -69,30 +70,30 @@ async def start():
     "/stop", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
 async def stop():
-    return u_response(program.stop())
+    return u_response(await program.stop())
 
 
 @router.get("/status", response_model=dict, dependencies=[Depends(get_current_user)])
 async def program_status():
-    if not program.is_running:
+    if not program.program_status.is_running:
         return {
             "status": False,
             "version": VERSION,
-            "first_run": program.first_run,
+            "first_run": program.program_status.first_run,
         }
     else:
         return {
             "status": True,
             "version": VERSION,
-            "first_run": program.first_run,
+            "first_run": program.program_status.first_run,
         }
 
 
 @router.get(
     "/shutdown", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
 async def shutdown_program():
-    program.stop()
+    await program.stop()
     logger.info("Shutting down program...")
     os.kill(os.getpid(), signal.SIGINT)
     return JSONResponse(
@@ -109,4 +110,4 @@ async def shutdown_program():
     dependencies=[Depends(get_current_user)],
 )
 async def check_downloader_status():
-    return program.check_downloader()
+    return await program.program_status.check_downloader()

backend/src/module/api/response.py

@@ -1,4 +1,3 @@
-from fastapi.exceptions import HTTPException
 from fastapi.responses import JSONResponse
 
 from module.models.response import ResponseModel