genre list

app.py

@@ -1,6 +1,6 @@
 from fastapi import FastAPI,HTTPException, Request, Query
 from fastapi.responses import JSONResponse
-from typing import Optional
+from typing import Optional, List
 from LoadBalancer import LoadBalancer
 import logging
 import os
@@ -82,17 +82,17 @@ async def get_recent_items(limit: int = 5):
     })
 
 @app.get("/api/get/genre")
-async def get_genre_items(genre: str, media_type: Optional[str] = None, limit: int = 5):
+async def get_genre_items(genre: List[str] = Query(...), media_type: Optional[str] = None, limit: int = 5):
     """
-    Get recent items from a specified genre with an optional media type filter and a limit on the number of results.
+    Get recent items from specified genres with an optional media type filter and a limit on the number of results.
 
-    :param genre: The genre to filter by (e.g., 'Comedy').
+    :param genre: The genres to filter by (e.g., 'Comedy').
     :param media_type: Optional. Filter by media type ('movie' or 'series').
     :param limit: The maximum number of items to return.
     :return: A JSON response containing the filtered items.
     """
-    # Get sorted entries based on genre and media type
-    entries = genre_list.get_sorted_entries(genre, media_type=media_type)
+    # Get sorted entries based on genres and media type
+    entries = genre_list.get_entries_by_multiple_genres(genre, media_type=media_type)
 
     # Slice the list to only return the desired number of items
     limited_entries = entries[:limit]

services.py

@@ -44,6 +44,8 @@ class RecentList:
             # Get sorted series with details
             return [(title, -year, self.series[title][1], self.series[title][2]) for year, title in self.sorted_series]
 
+import bisect
+
 class GenreList:
     def __init__(self):
         # Initialize a dictionary to store genres and their associated data
@@ -110,6 +112,42 @@ class GenreList:
         else:
             return []
 
+    def get_entries_by_multiple_genres(self, genre_names, media_type=None):
+        """
+        Get entries that are present in all specified genres.
+
+        :param genre_names: A list of genre names.
+        :param media_type: Optional. Filter by media type ('movie' or 'series').
+        :return: A list of tuples containing title, year, description, image_link, and media_type.
+        """
+        if not genre_names:
+            return []
+
+        # Get entries for the first genre
+        common_entries = set(self.genres[genre_names[0]]['entries'].keys()) if genre_names[0] in self.genres else set()
+
+        # Intersect with entries of the remaining genres
+        for genre_name in genre_names[1:]:
+            if genre_name in self.genres:
+                common_entries.intersection_update(self.genres[genre_name]['entries'].keys())
+            else:
+                return []
+
+        # Collect the sorted entries for the common titles
+        sorted_entries = []
+        for title in common_entries:
+            year = self.genres[genre_names[0]]['entries'][title][0]
+            description = self.genres[genre_names[0]]['entries'][title][1]
+            image_link = self.genres[genre_names[0]]['entries'][title][2]
+            media_type_entry = self.genres[genre_names[0]]['entries'][title][3]
+            if media_type is None or media_type_entry == media_type:
+                sorted_entries.append((title, year, description, image_link, media_type_entry))
+
+        # Sort the entries by year (descending)
+        sorted_entries.sort(key=lambda x: -x[1])
+
+        return sorted_entries
+
     def remove_genre(self, genre_name):
         """Remove a genre entirely from the list."""
         if genre_name in self.genres:
@@ -122,6 +160,7 @@ class GenreList:
             del self.genres[genre_name]['entries'][title]
             self.genres[genre_name]['sorted_entries'].remove((-old_year, title))
 
+
 # Example usage:
 # genre_list = GenreList()
 # genres = [
@@ -129,9 +168,14 @@ class GenreList:
 #     {"id": 17, "name": "Animation", "slug": "animation"},
 #     {"id": 27, "name": "Anime", "slug": "anime"}
 # ]
+# genres2 = [
+#     {"id": 15, "name": "Comedy", "slug": "comedy"},
+#     {"id": 17, "name": "Animation", "slug": "animation"},
+#     {"id": 27, "name": "Anime", "slug": "anime"}
+# ]
 # genre_list.add_entry(genres, 'Movie Title', 2023, 'Description here', 'image_link_here', 'movie')
-# genre_list.add_entry(genres, 'Series Title', 2022, 'Series Description', 'series_image_link_here', 'series')
-# sorted_comedy_movies = genre_list.get_sorted_entries('Comedy', media_type='movie')
-# sorted_comedy_series = genre_list.get_sorted_entries('Comedy')
-# print(sorted_comedy_movies)
-# print(sorted_comedy_series)
+# genre_list.add_entry(genres2, 'Series Title', 2022, 'Series Description', 'series_image_link_here', 'movie')
+
+# # Fetch entries that belong to both 'Comedy' and 'Animation'
+# sorted_entries = genre_list.get_entries_by_multiple_genres(['Comedy', 'Animation'], media_type='movie')
+# print(sorted_entries)  # This should return only 'Movie Title' which is in both 'Comedy' and 'Animation'