Merge pull request #5 from zeroquinc/classes-revamp

feature: classes / API revamp

api/trakt/client.py

@@ -22,4 +22,8 @@ def _get(self, endpoint, params=None):
 
     def user(self, username):
         from .endpoints.user import User
-        return User(self, username)
+        return User(self, username)
+
+    def shows(self):
+        from .endpoints.shows import Shows
+        return Shows(self)

api/trakt/endpoints/shows.py

@@ -0,0 +1,18 @@
+from api.trakt.models.show import Show
+
+class Shows:
+    def __init__(self, client):
+        self.client = client
+
+    def _get_show_list(self, endpoint):
+        params = {}
+        response = self.client._get(endpoint, params=params)
+        return [Show(show) for show in response]
+
+    def get_popular(self):
+        endpoint = 'shows/popular'
+        return [Show(show) for show in self.client._get(endpoint)]
+
+    def get_trending(self):
+        endpoint = 'shows/trending'
+        return self._get_show_list(endpoint)

api/trakt/models/episode.py

@@ -0,0 +1,15 @@
+from src.tmdb.client import TMDb
+
+class Episode:
+    def __init__(self, data):
+        self.title = data['episode']['title']
+        self.show_title = data['show']['title']
+        self.season_id = "{:02}".format(data['episode']['season'])  # Format as two-digit number
+        self.episode_id = "{:02}".format(data['episode']['number'])  # Format as two-digit number
+        self.year = data['show']['year']
+        self.slug = data['show']['ids']['slug']
+        self.trakt_id = data['show']['ids']['trakt']
+        self.imdb_id = data['show']['ids']['imdb']
+        self.tmdb_id = data['show']['ids']['tmdb']
+        self.tvdb_id = data['show']['ids']['tvdb']
+        self.poster = TMDb.show_poster_path(self.tvdb_id)

api/trakt/models/favorite.py

@@ -1,19 +1,32 @@
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 
+from api.trakt.models.movie import Movie
+from api.trakt.models.show import Show
+from api.trakt.models.season import Season
+from api.trakt.models.episode import Episode
+
 class Favorite:
     def __init__(self, data):
         self.type = data['type']
         self.listed_at = parse(data['listed_at']).astimezone(tzlocal())  # Convert to local timezone
+        self.date = self.listed_at.strftime("%d/%m/%Y %H:%M:%S")  # Convert to human readable format
         self.show_title = None
         self.season_id = None
         self.episode_id = None
+        self.trakt_id = None
+        self.imdb_id = None
+        self.tmdb_id = None
+        self.tvdb_id = None
+        self.poster = None
+        self.slug = None
         media = create_media(data)
         self.set_media_attributes(media)
 
     def set_media_attributes(self, media):
         self.title = media.title
         self.year = media.year
+        self.poster = media.poster
 
         if isinstance(media, (Episode, Season)):
             self.show_title = media.show_title
@@ -29,29 +42,4 @@ def from_json(cls, data):
 def create_media(data):
     media_classes = {'movie': Movie, 'episode': Episode, 'season': Season, 'show': Show}
     media_type = data['type']
-    return media_classes.get(media_type, lambda _: None)(data)
-
-class Movie:
-    def __init__(self, data):
-        self.title = data['movie']['title']
-        self.year = data['movie']['year']
-
-class Episode:
-    def __init__(self, data):
-        self.title = data['episode']['title']
-        self.show_title = data['show']['title']
-        self.season_id = "{:02}".format(data['episode']['season'])  # Format as two-digit number
-        self.episode_id = "{:02}".format(data['episode']['number'])  # Format as two-digit number
-        self.year = data['show']['year']
-
-class Season:
-    def __init__(self, data):
-        self.title = data['show']['title']
-        self.show_title = data['show']['title']
-        self.season_id = "{:02}".format(data['season']['number'])  # Format as two-digit number
-        self.year = data['show']['year']
-
-class Show:
-    def __init__(self, data):
-        self.title = data['show']['title']
-        self.year = data['show']['year']
+    return media_classes.get(media_type, lambda _: None)(data)

api/trakt/models/movie.py

@@ -0,0 +1,11 @@
+from src.tmdb.client import TMDb
+
+class Movie:
+    def __init__(self, data):
+        self.title = data['movie']['title']
+        self.year = data['movie']['year']
+        self.slug = data['movie']['ids']['slug']
+        self.trakt_id = data['movie']['ids']['trakt']
+        self.imdb_id = data['movie']['ids']['imdb']
+        self.tmdb_id = data['movie']['ids']['tmdb']
+        self.poster = TMDb.movie_poster_path(self.tmdb_id)

api/trakt/models/rating.py

@@ -1,7 +1,10 @@
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 
-from src.tmdb.client import TMDb
+from api.trakt.models.movie import Movie
+from api.trakt.models.show import Show
+from api.trakt.models.season import Season
+from api.trakt.models.episode import Episode
 
 class Rating:
     def __init__(self, data):
@@ -40,52 +43,4 @@ def from_json(cls, data):
 def create_media(data):
     media_classes = {'movie': Movie, 'episode': Episode, 'season': Season, 'show': Show}
     media_type = data['type']
-    return media_classes.get(media_type, lambda _: None)(data)
-
-class Movie:
-    def __init__(self, data):
-        self.title = data['movie']['title']
-        self.year = data['movie']['year']
-        self.slug = data['movie']['ids']['slug']
-        self.trakt_id = data['movie']['ids']['trakt']
-        self.imdb_id = data['movie']['ids']['imdb']
-        self.tmdb_id = data['movie']['ids']['tmdb']
-        self.poster = TMDb.movie_poster_path(self.tmdb_id)
-
-class Episode:
-    def __init__(self, data):
-        self.title = data['episode']['title']
-        self.show_title = data['show']['title']
-        self.season_id = "{:02}".format(data['episode']['season'])  # Format as two-digit number
-        self.episode_id = "{:02}".format(data['episode']['number'])  # Format as two-digit number
-        self.year = data['show']['year']
-        self.slug = data['show']['ids']['slug']
-        self.trakt_id = data['show']['ids']['trakt']
-        self.imdb_id = data['show']['ids']['imdb']
-        self.tmdb_id = data['show']['ids']['tmdb']
-        self.tvdb_id = data['show']['ids']['tvdb']
-        self.poster = TMDb.show_poster_path(self.tvdb_id)
-
-class Season:
-    def __init__(self, data):
-        self.title = data['show']['title']
-        self.show_title = data['show']['title']
-        self.season_id = "{:02}".format(data['season']['number'])  # Format as two-digit number
-        self.year = data['show']['year']
-        self.slug = data['show']['ids']['slug']
-        self.trakt_id = data['show']['ids']['trakt']
-        self.imdb_id = data['show']['ids']['imdb']
-        self.tmdb_id = data['show']['ids']['tmdb']
-        self.tvdb_id = data['show']['ids']['tvdb']
-        self.poster = TMDb.show_poster_path(self.tvdb_id)
-
-class Show:
-    def __init__(self, data):
-        self.title = data['show']['title']
-        self.year = data['show']['year']
-        self.slug = data['show']['ids']['slug']
-        self.trakt_id = data['show']['ids']['trakt']
-        self.imdb_id = data['show']['ids']['imdb']
-        self.tmdb_id = data['show']['ids']['tmdb']
-        self.tvdb_id = data['show']['ids']['tvdb']
-        self.poster = TMDb.show_poster_path(self.tvdb_id)
+    return media_classes.get(media_type, lambda _: None)(data)

api/trakt/models/season.py

@@ -0,0 +1,14 @@
+from src.tmdb.client import TMDb
+
+class Season:
+    def __init__(self, data):
+        self.title = data['show']['title']
+        self.show_title = data['show']['title']
+        self.season_id = "{:02}".format(data['season']['number'])  # Format as two-digit number
+        self.year = data['show']['year']
+        self.slug = data['show']['ids']['slug']
+        self.trakt_id = data['show']['ids']['trakt']
+        self.imdb_id = data['show']['ids']['imdb']
+        self.tmdb_id = data['show']['ids']['tmdb']
+        self.tvdb_id = data['show']['ids']['tvdb']
+        self.poster = TMDb.show_poster_path(self.tvdb_id)

api/trakt/models/show.py

@@ -0,0 +1,13 @@
+from src.tmdb.client import TMDb
+
+class Show:
+    def __init__(self, data):
+        show_data = data['show'] if 'show' in data else data
+        self.title = show_data['title']
+        self.year = show_data['year']
+        self.slug = show_data['ids']['slug']
+        self.trakt_id = show_data['ids']['trakt']
+        self.imdb_id = show_data['ids']['imdb']
+        self.tmdb_id = show_data['ids']['tmdb']
+        self.tvdb_id = show_data['ids']['tvdb']
+        self.poster = TMDb.show_poster_path(self.tvdb_id)

src/discord/cogs/tasks.py

@@ -1,20 +1,31 @@
 from discord.ext import tasks, commands
 
 from utils.custom_logger import logger
-from src.trakt.functions import process_ratings
+from src.trakt.functions import process_ratings, process_favorites
 
 class TasksCog(commands.Cog):
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
         self.trakt_ratings.start()
+        self.trakt_favorites.start()
 
+    # Task to process recent Trakt ratings
     @tasks.loop(minutes=60)
     async def trakt_ratings(self):
         ratings_channel = self.bot.get_channel(1052967176828616724)
         try:
             await process_ratings(ratings_channel, 'desiler')
         except Exception as e:
             logger.error(f'Error processing recent Trakt ratings: {e}')
+
+    # Task to process recent Trakt favorites
+    @tasks.loop(hours=24)
+    async def trakt_favorites(self):
+        favorites_channel = self.bot.get_channel(1052967176828616724)
+        try:
+            await process_favorites(favorites_channel, 'desiler')
+        except Exception as e:
+            logger.error(f'Error processing recent Trakt ratings: {e}')
 
 async def setup(bot):
     logger.info('Cogs have been loaded')

src/trakt/functions.py

@@ -1,21 +1,21 @@
-from datetime import datetime, timedelta
-
 from src.discord.embed import EmbedBuilder
 from api.trakt.client import TraktClient
+from utils.datetime import get_times
 
+# Function to process recent ratings and send them to a specified Discord channel as embeds
 async def process_ratings(ratings_channel, username):
     client = TraktClient()
     user = client.user(username)
-    now = datetime.now()
-    one_hour_ago = now - timedelta(hours=120)
-    ratings = user.get_ratings(start_time=one_hour_ago, end_time=now)
+    now, one_hour_ago = get_times()
+    ratings = sorted(user.get_ratings(start_time=one_hour_ago, end_time=now), key=lambda rating: rating.date) # Get ratings sorted by date
+    #ratings = user.get_ratings(start_time=one_hour_ago, end_time=now) # Get ratings
 
     async def process_rating(rating):
         description_formats = {
-            'show': f"**{rating.show_title}**\n{rating.title}\n\n {username} rated this {rating.type} with {rating.rated} :star:",
-            'season': f"**{rating.show_title}**\nSeason {rating.season_id}\n\n {username} rated this {rating.type} with {rating.rated} :star:",
-            'episode': f"**{rating.show_title} (S{rating.season_id}E{rating.episode_id})**\n{rating.title}\n\n {username} rated this {rating.type} with {rating.rated} :star:",
-            'movie': f"**{rating.title} ({rating.year})**\n\n {username} rated this {rating.type} with {rating.rated} :star:"
+            'show': f"**{rating.title}**\n\n{username} rated this {rating.type}\n{rating.rated} :star:",
+            'season': f"**{rating.show_title}**\nSeason {rating.season_id}\n\n{username} rated this {rating.type}\n{rating.rated} :star:",
+            'episode': f"**{rating.show_title} (S{rating.season_id}E{rating.episode_id})**\n{rating.title}\n\n{username} rated this {rating.type}\n{rating.rated} :star:",
+            'movie': f"**{rating.title} ({rating.year})**\n\n{username} rated this {rating.type}\n{rating.rated} :star:"
         }
         description = description_formats[rating.type]
         embed_builder = EmbedBuilder(description=description, color=0xFF0000)
@@ -25,3 +25,26 @@ async def process_rating(rating):
 
     for rating in ratings:
         await process_rating(rating)
+
+# Function to process recent favorites and send them to a specified Discord channel as embeds
+async def process_favorites(favorites_channel, username):
+    client = TraktClient()
+    user = client.user(username)
+    now, one_hour_ago = get_times()
+    favorites = sorted(user.get_favorites(start_time=one_hour_ago, end_time=now), key=lambda favorite: favorite.date)
+
+    async def process_favorite(favorite):
+        description_formats = {
+            'show': f"**{favorite.title}**\n\n{username} favorited this {favorite.type}",
+            'season': f"**{favorite.show_title}**\nSeason {favorite.season_id}\n\n{username} favorited this {favorite.type}",
+            'episode': f"**{favorite.show_title} (S{favorite.season_id}E{favorite.episode_id})**\n{favorite.title}\n\n{username} favorited this {favorite.type}",
+            'movie': f"**{favorite.title} ({favorite.year})**\n\n{username} favorited this {favorite.type}"
+        }
+        description = description_formats[favorite.type]
+        embed_builder = EmbedBuilder(description=description, color=0xFF0000)
+        embed_builder.set_footer(text=favorite.date)
+        embed_builder.set_thumbnail(url=favorite.poster)
+        await embed_builder.send_embed(favorites_channel)
+
+    for favorite in favorites:
+        await process_favorite(favorite)

test.py

@@ -1,22 +1,10 @@
-from datetime import datetime, timedelta
 from api.trakt.client import TraktClient
 
 client = TraktClient()
-user = client.user('desiler')
+shows_instance = client.shows()
 
-# Get the current time and the time one hour ago
-now = datetime.now()
-one_hour_ago = now - timedelta(hours=1200)
-
-#ratings = user.get_ratings(start_time=one_hour_ago, end_time=now)
-#ratings = user.get_ratings()
-#for rating in ratings:
-favorites = user.get_favorites(start_time=one_hour_ago, end_time=now)
-for favorite in favorites:
-    print(f"Title: {favorite.title}")
-    print(f"Media type: {favorite.type}")
-    print(f"Season: {favorite.season_id}")
-    print(f"Episode: {favorite.episode_id}")
-    print(f"Listed at: {favorite.listed_at}")
-    print(f"Show title: {favorite.show_title}")
-    print()
+for show in shows_instance.get_trending():
+    print(show.title)
+
+for show in shows_instance.get_popular():
+    print(show.title)

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