Merge pull request #164 from danielx/feat/added-notification

feat: support for "Added" notification
danielx · Oct 20, 2024 · 0580fcd · 0580fcd
2 parents 8c9dc9f + 7a236df
commit 0580fcd
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 16 deletions.
diff --git a/app/api_v1/endpoints/radarr.py b/app/api_v1/endpoints/radarr.py
@@ -9,7 +9,7 @@
 router = APIRouter()
 
 MESSAGE = string.Template(
-    """Now available: *$title* ($year)
+    """$event: *$title* ($year)
 https://www.themoviedb.org/movie/$id"""
 )
 
@@ -22,14 +22,15 @@ async def radarr(event: schemas.RadarrEvent):
     """Incoming webhook for radarr events."""
     logging.info(repr(event))
 
-    if event.eventType != "Download":
+    if event.eventType not in ["Download", "MovieAdded"]:
         return Response(status_code=status.HTTP_204_NO_CONTENT)
 
     await libs.gchat.send_message(
         MESSAGE.substitute(
+            event="Now available" if event.eventType == "Download" else "Added",
             title=event.movie.title.strip(),
             year=event.movie.year,
-            id=event.remoteMovie.tmdbId,
+            id=event.movie.tmdbId,
         )
     )
 

diff --git a/app/api_v1/endpoints/sonarr.py b/app/api_v1/endpoints/sonarr.py
@@ -9,7 +9,7 @@
 router = APIRouter()
 
 MESSAGE = string.Template(
-    """Now available: *$title*
+    """$event: *$title*
 $items
 https://www.thetvdb.com/dereferrer/series/$id"""
 )
@@ -25,7 +25,7 @@ async def sonarr_webhook(event: schemas.SonarrEvent):
     """Incoming webhook for sonarr events."""
     logging.info(repr(event))
 
-    if event.eventType != "Download":
+    if event.eventType not in ["Download", "SeriesAdd"]:
         return Response(status_code=status.HTTP_204_NO_CONTENT)
 
     items = []
@@ -39,6 +39,7 @@ async def sonarr_webhook(event: schemas.SonarrEvent):
 
     await libs.gchat.send_message(
         MESSAGE.substitute(
+            event="Now available" if event.eventType == "Download" else "Added",
             title=event.series.title.strip(),
             items="\n".join(items),
             id=event.series.tvdbId,

diff --git a/app/schemas/_events.py b/app/schemas/_events.py
@@ -4,17 +4,13 @@
 class Movie(BaseModel):
     title: str
     year: int
-
-
-class RemoteMovie(BaseModel):
     tmdbId: int
 
 
 class RadarrEvent(BaseModel):
     eventType: str
 
     movie: Movie
-    remoteMovie: RemoteMovie
 
 
 class Series(BaseModel):
@@ -32,4 +28,4 @@ class SonarrEvent(BaseModel):
     eventType: str
 
     series: Series
-    episodes: list[Episode]
+    episodes: list[Episode] = []
diff --git a/tests/test_radarr.py b/tests/test_radarr.py
@@ -23,8 +23,7 @@ class Payload(NamedTuple):
     )
     json: dict | None = {
         "eventType": "Grab",
-        "movie": {"title": "string", "year": 0},
-        "remoteMovie": {"tmdbId": 0},
+        "movie": {"title": "string", "year": 0, "tmdbId": 0},
     }
 
 
@@ -44,12 +43,23 @@ class Result(NamedTuple):
                 notification_sent=False,
             ),
         ),
-        (  # only notify on eventType=Download
+        (  # notify on eventType=Download
             Payload(
                 json={
                     "eventType": "Download",
-                    "movie": {"title": "string", "year": 0},
-                    "remoteMovie": {"tmdbId": 0},
+                    "movie": {"title": "string", "year": 0, "tmdbId": 0},
+                }
+            ),
+            Result(
+                status_code=204,
+                notification_sent=True,
+            ),
+        ),
+        (  # notify on eventType=MovieAdded
+            Payload(
+                json={
+                    "eventType": "MovieAdded",
+                    "movie": {"title": "string", "year": 0, "tmdbId": 0},
                 }
             ),
             Result(

diff --git a/tests/test_sonarr.py b/tests/test_sonarr.py
@@ -47,7 +47,7 @@ class Result(NamedTuple):
                 notification_sent=False,
             ),
         ),
-        (  # only notify on eventType=Download
+        (  # notify on eventType=Download
             Payload(
                 json={
                     "eventType": "Download",
@@ -63,6 +63,18 @@ class Result(NamedTuple):
                 notification_sent=True,
             ),
         ),
+        (  # notify on eventType=SeriesAdd
+            Payload(
+                json={
+                    "eventType": "SeriesAdd",
+                    "series": {"title": "string", "tvdbId": 0},
+                }
+            ),
+            Result(
+                status_code=204,
+                notification_sent=True,
+            ),
+        ),
         (  # verify invalid auth
             Payload(
                 auth=(settings.basic_auth_username, b"invalid-password"),