Merge pull request #101 from shinonomeow/shino_aio

add database and fix parser error

Author: shinonomeow

.gitignore

@@ -221,4 +221,3 @@ backend/src/.vscode/
 
 # test file
 test.*
-test_*

backend/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
-name = "backend"
-version = "0.1.0"
+name = "Auto_Bangumi"
+version = "3.2.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -113,7 +113,7 @@ exclude = [
 per-file-ignores = {}
 
 # Same as Black.
-line-length = 88
+line-length = 120
 
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
@@ -126,11 +126,8 @@ target-version = "py311"
 max-complexity = 10
 
 [tool.black]
-line-length = 88
+line-length = 120
 target-version = ['py311']
 
 [dependency-groups]
-dev = [
- "pytest>=8.4.1",
- "pytest-asyncio>=1.1.0",
-]
+dev = ["pytest>=8.4.1", "pytest-asyncio>=1.1.0"]

backend/src/main.py

@@ -31,10 +31,8 @@
 
 def create_app() -> FastAPI:
     app = FastAPI(lifespan=lifespan)
-
     # mount routers
     app.include_router(v1, prefix="/api")
-
     return app
 
 

backend/src/module/api/__init__.py

@@ -10,7 +10,7 @@
 from .search import router as search_router
 from .torrent import router as torrent_router
 
-__all__ = ["v1","lifespan"]
+__all__ = ["v1", "lifespan"]
 
 # API 1.0
 v1 = APIRouter(prefix="/v1")

backend/src/module/api/auth.py

@@ -31,28 +31,20 @@ async def login(response: Response, form_data=Depends(OAuth2PasswordRequestForm)
             msg_zh="用户名或密码错误",
         )
     else:
-        token = create_access_token(
-            data={"sub": user.username}, expires_delta=timedelta(days=1)
-        )
+        token = create_access_token(data={"sub": user.username}, expires_delta=timedelta(days=1))
         response.set_cookie(key="token", value=token, httponly=True, max_age=86400)
         return {"access_token": token, "token_type": "bearer"}
     return u_response(resp)
 
 
-@router.get(
-    "/refresh_token", response_model=dict, dependencies=[Depends(get_current_user)]
-)
+@router.get("/refresh_token", response_model=dict, dependencies=[Depends(get_current_user)])
 async def refresh(response: Response):
-    token = create_access_token(
-        data={"sub": active_user[0]}, expires_delta=timedelta(days=1)
-    )
+    token = create_access_token(data={"sub": active_user[0]}, expires_delta=timedelta(days=1))
     response.set_cookie(key="token", value=token, httponly=True, max_age=86400)
     return {"access_token": token, "token_type": "bearer"}
 
 
-@router.get(
-    "/logout", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/logout", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def logout(response: Response):
     active_user.clear()
     response.delete_cookie(key="token")
@@ -66,9 +58,7 @@ async def logout(response: Response):
 async def update_user(user_data: UserUpdate, response: Response):
     old_user = active_user[0]
     if update_user_info(user_data, old_user):
-        token = create_access_token(
-            data={"sub": old_user}, expires_delta=timedelta(days=1)
-        )
+        token = create_access_token(data={"sub": old_user}, expires_delta=timedelta(days=1))
         response.set_cookie(
             key="token",
             value=token,

backend/src/module/api/bangumi.py

@@ -6,7 +6,7 @@
 
 from module.database import Database, engine
 from module.manager import BangumiManager
-from module.models import APIResponse, Bangumi, BangumiUpdate, ResponseModel,Torrent
+from module.models import APIResponse, Bangumi, ResponseModel
 from module.security.api import get_current_user
 
 from .response import u_response
@@ -15,11 +15,7 @@
 logger = logging.getLogger(__name__)
 
 
-
-
-@router.get(
-    "/get/all", response_model=list[Bangumi], dependencies=[Depends(get_current_user)]
-)
+@router.get("/get/all", response_model=list[Bangumi], dependencies=[Depends(get_current_user)])
 async def get_all_data():
     with Database() as db:
         return db.bangumi.search_all()
@@ -49,9 +45,9 @@ async def get_data(bangumi_id: str):
 )
 async def update_rule(
     bangumi_id: int,
-    data: BangumiUpdate,
+    data: Bangumi,
 ):
-    resp = await BangumiManager().update_rule(bangumi_id, data)
+    resp = await BangumiManager().update_rule(data)
     if resp:
         resp = ResponseModel(
             status_code=200,
@@ -211,9 +207,7 @@ async def refresh_single_poster(bangumi_id: int):
     return u_response(resp)
 
 
-@router.get(
-    "/reset/all", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/reset/all", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def reset_all():
     with Database(engine) as db:
         db.bangumi.delete_all()
@@ -224,30 +218,3 @@ async def reset_all():
             "msg_zh": "重置所有规则成功。",
         },
     )
-
-
-# @router.get("/get_torrent", response_model=list[Torrent], dependencies=[Depends(get_current_user)])
-# async def manage_bangumi(_id:int):
-#     """
-#     管理对应 Bangumi 的规则
-#     """
-#     try:
-#         resp = await BangumiManager().fetch_all_bangumi_torrents(_id)
-#         return resp
-#     except Exception as e:
-#         logger.error(f"[Bangumi] Error managing bangumi: {e}")
-#         return []
-#
-# @router.get("/download_torrent", response_model=APIResponse, dependencies=[Depends(get_current_user)])
-# async def download_bangumi(_id:int, torrent:Torrent):
-#     """
-#     手动下载对应 Bangumi 的种子
-#     """
-#     try:
-#         resp = BangumiManager().download_torrent(_id,torrent)
-#         return resp
-#     except Exception as e:
-#         logger.error(f"[Bangumi] Error downloading bangumi: {e}")
-#         return []
-
-

backend/src/module/api/config.py

@@ -16,12 +16,14 @@
 async def get_config():
     return settings
 
+
 # 测试通知的是否生效
 @router.post("/test_notify", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def test_notify(config: Notification):
     try:
         from module.notification.notification import PostNotification
         from module.models import Message
+
         print(config)
 
         title = "AB通知测试"
@@ -47,9 +49,7 @@ async def test_notify(config: Notification):
         )
 
 
-@router.patch(
-    "/update", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.patch("/update", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def update_config(config: Config):
     try:
         settings.save(config_dict=config.model_dump())

backend/src/module/api/log.py

@@ -27,9 +27,7 @@ async def get_log():
         return Response("Log file not found", status_code=404)
 
 
-@router.get(
-    "/clear", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/clear", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def clear_log():
     if LOG_PATH.exists():
         LOG_PATH.write_text("")

backend/src/module/api/program.py

@@ -29,9 +29,7 @@ async def lifespan(app: FastAPI):
     await program.stop()
 
 
-@router.get(
-    "/restart", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/restart", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def restart():
     try:
         await program.restart()
@@ -55,9 +53,7 @@ async def restart():
         )
 
 
-@router.get(
-    "/start", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/start", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def start():
     try:
         await program.start()
@@ -81,9 +77,7 @@ async def start():
         )
 
 
-@router.get(
-    "/stop", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/stop", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def stop():
     await program.stop()
     return u_response(
@@ -112,9 +106,7 @@ async def program_status():
         }
 
 
-@router.get(
-    "/shutdown", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.get("/shutdown", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def shutdown_program():
     await program.stop()
     logger.info("Shutting down program...")

backend/src/module/api/rss.py

@@ -7,7 +7,6 @@
     Bangumi,
     ResponseModel,
     RSSItem,
-    RSSUpdate,
     Torrent,
 )
 from module.rss import RSSAnalyser, RSSEngine, RSSManager, RSSRefresh
@@ -21,16 +20,12 @@
 collector = SeasonCollector()
 
 
-@router.get(
-    path="", response_model=list[RSSItem], dependencies=[Depends(get_current_user)]
-)
+@router.get(path="", response_model=list[RSSItem], dependencies=[Depends(get_current_user)])
 async def get_rss():
     return RSSManager().search_all()
 
 
-@router.post(
-    path="/add", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.post(path="/add", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 # 此为聚合用
 async def add_rss(rss: RSSItem):
     manager = RSSManager()
@@ -156,12 +151,8 @@ async def disable_many_rss(rss_ids: list[int]):
     response_model=APIResponse,
     dependencies=[Depends(get_current_user)],
 )
-async def update_rss(
-    rss_id: int, data: RSSUpdate, current_user=Depends(get_current_user)
-):
-    if not current_user:
-        raise UNAUTHORIZED
-    if RSSManager().update(rss_id, data):
+async def update_rss(rss_id: int, data: RSSItem):
+    if RSSManager().update(data):
         return JSONResponse(
             status_code=200,
             content={
@@ -192,21 +183,21 @@ async def refresh_all():
     )
 
 
-@router.get(
-    path="/refresh/{rss_id}",
-    response_model=APIResponse,
-    dependencies=[Depends(get_current_user)],
-)
-async def refresh_rss(rss_id: int):
-    # TODO: 还没做
-    await engine.refresh_rss(rss_id=rss_id)
-    return JSONResponse(
-        status_code=200,
-        content={
-            "msg_en": "Refresh RSS successfully.",
-            "msg_zh": "刷新 RSS 成功。",
-        },
-    )
+# @router.get(
+#     path="/refresh/{rss_id}",
+#     response_model=APIResponse,
+#     dependencies=[Depends(get_current_user)],
+# )
+# async def refresh_rss(rss_id: int):
+#     # TODO: 还没做
+#     await engine.refresh_rss(rss_id=rss_id)
+#     return JSONResponse(
+#         status_code=200,
+#         content={
+#             "msg_en": "Refresh RSS successfully.",
+#             "msg_zh": "刷新 RSS 成功。",
+#         },
+#     )
 
 
 @router.get(
@@ -220,9 +211,7 @@ async def get_torrent(
     return RSSManager().get_rss_torrents(rss_id)
 
 
-@router.post(
-    "/analysis", response_model=Bangumi, dependencies=[Depends(get_current_user)]
-)
+@router.post("/analysis", response_model=Bangumi, dependencies=[Depends(get_current_user)])
 async def analysis(rss: RSSItem):
     torrents = await RSSRefresh(rss).pull_rss()
     if not torrents:
@@ -250,9 +239,7 @@ async def analysis(rss: RSSItem):
     )
 
 
-@router.post(
-    "/collect", response_model=APIResponse, dependencies=[Depends(get_current_user)]
-)
+@router.post("/collect", response_model=APIResponse, dependencies=[Depends(get_current_user)])
 async def download_collection(data: Bangumi):
     resp = await engine.download_bangumi(bangumi=data)