feature: move clients to api folder and working sonarr/radarr webhooks

src/radarr/client.py → api/radarr/client.py

@@ -1,6 +1,7 @@
 import json
 from utils.custom_logger import logger
 
+from src.radarr.functions import process_webhook
 class RadarrWebhookHandler:
     def __init__(self, payload, discord_bot):
         self.payload = payload
@@ -27,4 +28,6 @@ def initialize_global_variables(self):
 
     async def handle_webhook(self):
         logger.info(f"Processing Radarr webhook payload for event type: {self.event_type}")
-        logger.debug(f"Payload: {json.dumps(self.payload, indent=4)}")
+        logger.debug(f"Payload: {json.dumps(self.payload, indent=4)}")
+        channel = self.discord_bot.bot.get_channel(1052967176828616724)
+        await process_webhook(self, channel)

src/sonarr/client.py → api/sonarr/client.py

@@ -1,6 +1,8 @@
 import json
 from utils.custom_logger import logger
 
+from src.sonarr.functions import process_webhook
+
 class SonarrWebhookHandler:
     def __init__(self, payload, discord_bot):
         self.payload = payload
@@ -47,4 +49,6 @@ def handle_episode_request(self):
 
     async def handle_webhook(self):
         logger.info(f"Processing Sonarr webhook payload for event type: {self.event_type}")
-        logger.debug(f"Payload: {json.dumps(self.payload, indent=4)}")
+        logger.debug(f"Payload: {json.dumps(self.payload, indent=4)}")
+        channel = self.discord_bot.bot.get_channel(1052967176828616724)
+        await process_webhook(self, channel)

api/trakt/models/rating.py

@@ -1,7 +1,7 @@
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 
-from src.tmdb.client import TMDb
+from api.tmdb.client import TMDb
 
 class Rating:
     def __init__(self, data):

main.py

@@ -4,6 +4,7 @@
 from src.discord.bot import DiscordBot
 
 from config.globals import DISCORD_TOKEN
+from utils.custom_logger import logger
 
 async def main():
     discord_bot = DiscordBot(DISCORD_TOKEN)
@@ -17,4 +18,7 @@ async def main():
     await webhook.cleanup()
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    try:
+        asyncio.run(main())
+    except KeyboardInterrupt:
+        logger.info("Bot stopped by keyboard interrupt.")

src/radarr/functions.py

@@ -0,0 +1,33 @@
+from src.discord.embed import EmbedBuilder
+from utils.custom_logger import logger
+
+async def process_webhook(handler, channel):
+    def build_grab_embed():
+        embed = EmbedBuilder(description="A grab event has occurred.")
+        return embed
+
+    def build_download_embed():
+        embed = EmbedBuilder(description="A download event has occurred.")
+        return embed
+
+    def build_application_update_embed():
+        embed = EmbedBuilder(description="An application update event has occurred.")
+        return embed
+
+    def build_test_embed():
+        embed = EmbedBuilder(description="A test event has occurred.")
+        return embed
+
+    embed_builders = {
+        'Grab': build_grab_embed,
+        'Download': build_download_embed,
+        'ApplicationUpdate': build_application_update_embed,
+        'Test': build_test_embed,
+    }
+
+    if handler.event_type not in embed_builders:
+        logger.error(f"Unknown event type: {handler.event_type}")
+        return
+
+    embed_builder = embed_builders[handler.event_type]()
+    await embed_builder.send_embed(channel)

src/sonarr/functions.py

@@ -0,0 +1,33 @@
+from src.discord.embed import EmbedBuilder
+from utils.custom_logger import logger
+
+async def process_webhook(handler, channel):
+    def build_grab_embed():
+        embed = EmbedBuilder(description="A grab event has occurred.")
+        return embed
+
+    def build_download_embed():
+        embed = EmbedBuilder(description="A download event has occurred.")
+        return embed
+
+    def build_application_update_embed():
+        embed = EmbedBuilder(description="An application update event has occurred.")
+        return embed
+
+    def build_test_embed():
+        embed = EmbedBuilder(description="A test event has occurred.")
+        return embed
+
+    embed_builders = {
+        'Grab': build_grab_embed,
+        'Download': build_download_embed,
+        'ApplicationUpdate': build_application_update_embed,
+        'Test': build_test_embed,
+    }
+
+    if handler.event_type not in embed_builders:
+        logger.error(f"Unknown event type: {handler.event_type}")
+        return
+
+    embed_builder = embed_builders[handler.event_type]()
+    await embed_builder.send_embed(channel)

src/trakt/functions.py

@@ -1,13 +1,12 @@
-from datetime import datetime, timedelta
+from utils.datetime import get_times
 
 from src.discord.embed import EmbedBuilder
 from api.trakt.client import TraktClient
 
 async def process_ratings(ratings_channel, username):
     client = TraktClient()
     user = client.user(username)
-    now = datetime.now()
-    one_hour_ago = now - timedelta(hours=120)
+    now, one_hour_ago = get_times()
     ratings = user.get_ratings(start_time=one_hour_ago, end_time=now)
 
     async def process_rating(rating):

src/webhook/hook.py

@@ -1,8 +1,8 @@
 from aiohttp import web
 
 from utils.custom_logger import logger
-from src.sonarr.client import SonarrWebhookHandler
-from src.radarr.client import RadarrWebhookHandler
+from api.sonarr.client import SonarrWebhookHandler
+from api.radarr.client import RadarrWebhookHandler
 
 class HandleWebHook:
     # Initialize the webhook receiver

utils/datetime.py

@@ -2,5 +2,5 @@
 
 def get_times():
     now = datetime.now()
-    one_hour_ago = now - timedelta(hours=1200)
+    one_hour_ago = now - timedelta(hours=1)
     return now, one_hour_ago