From 6288d5ccf215d77d0f7068f2dca702680068186c Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 14 Jun 2023 11:23:49 +0800 Subject: [PATCH] fix sonarr --- app/api/servarr.py | 27 ++------------------------- app/schemas/servarr.py | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 36 deletions(-) diff --git a/app/api/servarr.py b/app/api/servarr.py index 12cd2ae5..b65397ed 100644 --- a/app/api/servarr.py +++ b/app/api/servarr.py @@ -210,7 +210,6 @@ async def arr_movies(apikey: str, db: Session = Depends(get_db)) -> Any: tmdbId=subscribe.tmdbid, profileId=1, qualityProfileId=1, - added=True, hasFile=False, )) return result @@ -238,19 +237,10 @@ async def arr_movie_lookup(apikey: str, term: str, db: Session = Depends(get_db) tmdbId=subscribe.tmdbid, profileId=1, qualityProfileId=1, - added=True, hasFile=False, )] else: - return [RadarrMovie( - isAvailable=False, - monitored=False, - tmdbId=tmdbid, - profileId=1, - qualityProfileId=1, - added=False, - hasFile=False, - )] + return [RadarrMovie()] @arr_router.get("/movie/{mid}", response_model=schemas.RadarrMovie) @@ -273,7 +263,6 @@ async def arr_movie(apikey: str, mid: int, db: Session = Depends(get_db)) -> Any tmdbId=subscribe.tmdbid, profileId=1, qualityProfileId=1, - added=True, hasFile=False, ) else: @@ -463,7 +452,6 @@ async def arr_series(apikey: str, db: Session = Depends(get_db)) -> Any: profileId=1, languageProfileId=1, qualityProfileId=1, - added=True, hasFile=False, )) return result @@ -501,21 +489,10 @@ async def arr_series_lookup(apikey: str, term: str, db: Session = Depends(get_db profileId=1, languageProfileId=1, qualityProfileId=1, - added=True, hasFile=False, )] else: - return [SonarrSeries( - id=0, - isAvailable=False, - monitored=False, - profileId=1, - languageProfileId=1, - qualityProfileId=1, - added=False, - hasFile=False, - seasons=[] - )] + return [SonarrSeries()] @arr_router.get("/series/{tid}") diff --git a/app/schemas/servarr.py b/app/schemas/servarr.py index 7abb2518..50bd35db 100644 --- a/app/schemas/servarr.py +++ b/app/schemas/servarr.py @@ -6,8 +6,8 @@ class RadarrMovie(BaseModel): id: Optional[int] title: Optional[str] year: Optional[int] - isAvailable: Optional[bool] - monitored: Optional[bool] + isAvailable: bool = False + monitored: bool = False tmdbId: Optional[int] imdbId: Optional[str] titleSlug: Optional[str] @@ -16,7 +16,7 @@ class RadarrMovie(BaseModel): profileId: Optional[int] qualityProfileId: Optional[int] added: Optional[str] - hasFile: Optional[bool] + hasFile: bool = False class SonarrSeries(BaseModel): @@ -28,16 +28,16 @@ class SonarrSeries(BaseModel): overview: Optional[str] network: Optional[str] airTime: Optional[str] - images: Optional[list] + images: list = [] remotePoster: Optional[str] - seasons: Optional[list] + seasons: list = [] year: Optional[int] path: Optional[str] profileId: Optional[int] languageProfileId: Optional[int] - seasonFolder: Optional[bool] - monitored: Optional[bool] - useSceneNumbering: Optional[bool] + seasonFolder: bool = False + monitored: bool = False + useSceneNumbering: bool = False runtime: Optional[int] tvdbId: Optional[int] tvRageId: Optional[int] @@ -48,9 +48,9 @@ class SonarrSeries(BaseModel): imdbId: Optional[str] titleSlug: Optional[str] certification: Optional[str] - genres: Optional[list] - tags: Optional[list] + genres: list = [] + tags: list = [] added: Optional[str] ratings: Optional[dict] qualityProfileId: Optional[int] - statistics: Optional[dict] + statistics: dict = {}