fix: fix #280, add Json response

This commit is contained in:
EstrellaXD
2023-06-02 14:05:41 +08:00
parent 95e1c1888a
commit fae2f6008c
3 changed files with 13 additions and 7 deletions

View File

@@ -1,4 +1,5 @@
from fastapi import Depends, HTTPException, status
from fastapi.responses import JSONResponse
from .log import router
@@ -39,7 +40,8 @@ async def update_data(data: BangumiData, current_user=Depends(get_current_user))
status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token"
)
with TorrentManager() as torrent:
return torrent.update_rule(data)
response = torrent.update_rule(data)
return JSONResponse(status_code=200, content=response)
@router.delete("/api/v1/bangumi/deleteRule/{bangumi_id}", tags=["bangumi"])
@@ -49,7 +51,8 @@ async def delete_data(bangumi_id: str, file:bool = False, current_user=Depends(g
status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token"
)
with TorrentManager() as torrent:
return torrent.delete_rule(bangumi_id, file)
response = torrent.delete_rule(bangumi_id, file)
return JSONResponse(status_code=200, content=response)
@router.delete("/api/v1/bangumi/disableRule/{bangumi_id}", tags=["bangumi"])
@@ -61,7 +64,8 @@ async def delete_rule(
status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token"
)
with TorrentManager() as torrent:
return torrent.disable_rule(bangumi_id, file)
response = torrent.disable_rule(bangumi_id, file)
return JSONResponse(status_code=200, content=response)
@router.get("/api/v1/bangumi/enableRule/{bangumi_id}", tags=["bangumi"])
@@ -71,7 +75,8 @@ async def enable_rule(bangumi_id: str, current_user=Depends(get_current_user)):
status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token"
)
with TorrentManager() as torrent:
return torrent.enable_rule(bangumi_id)
response = torrent.enable_rule(bangumi_id)
return JSONResponse(status_code=200, content=response)
@router.get("/api/v1/bangumi/resetAll", tags=["bangumi"])

View File

@@ -13,8 +13,8 @@ logger = logging.getLogger(__name__)
class TorrentPath:
def __init__(self):
self.download_path = settings.downloader.path
def __init__(self, download_path: str = settings.downloader.path):
self.download_path = download_path
@staticmethod
def check_files(info):

View File

@@ -31,9 +31,10 @@ class SeasonCollector(DownloadClient):
with BangumiDatabase() as db:
data.added = True
data.eps_collect = True
self.set_rule(data)
db.insert(data)
self.add_rss_feed(data.rss_link[0], item_path=data.official_title)
self.set_rule(data)
def eps_complete():