improve recent

services.py

@@ -2,21 +2,20 @@ import bisect
 
 class RecentList:
     def __init__(self):
-        # Initialize dictionaries to store titles and years
+        # Initialize dictionaries to store titles and associated data
         self.films = {}
         self.series = {}
         # Initialize lists to keep track of the sorted entries
         self.sorted_films = []
         self.sorted_series = []
 
-    def add_entry(self, title, year, media_type):
+    def add_entry(self, title, year, description, image_link, media_type):
         if media_type == 'film':
-            self._update_entry(self.films, self.sorted_films, title, year)
-        
+            self._update_entry(self.films, self.sorted_films, title, year, description, image_link)
         elif media_type == 'series':
-            self._update_entry(self.series, self.sorted_series, title, year)
+            self._update_entry(self.series, self.sorted_series, title, year, description, image_link)
     
-    def _update_entry(self, dictionary, sorted_list, title, year):
+    def _update_entry(self, dictionary, sorted_list, title, year, description, image_link):
         try:
             # Convert year to integer
             year = int(year)
@@ -24,44 +23,43 @@ class RecentList:
             raise ValueError(f"Invalid year: {year}. Year must be an integer.")
 
         if title in dictionary:
-            # Remove the old year from the sorted list if it exists
-            old_year = dictionary[title]
+            # Remove the old entry from the sorted list if it exists
+            old_year = dictionary[title][0]  # Get the old year
             try:
                 sorted_list.remove((-old_year, title))
             except ValueError:
                 pass  # Ignore if the old entry does not exist in the sorted list
         
         # Update or add the new entry in the dictionary
-        dictionary[title] = year
+        dictionary[title] = (year, description, image_link)
         
-        # Insert the new year into the sorted list
+        # Insert the new year and title into the sorted list
         bisect.insort(sorted_list, (-year, title))
 
     def get_sorted_entries(self, media_type):
         if media_type == 'film':
-            # Convert sorted list back to the correct format with positive years
-            return [ (title, -year) for year, title in self.sorted_films ]
-        
+            # Get sorted films with details
+            return [(title, -year, self.films[title][1], self.films[title][2]) for year, title in self.sorted_films]
         elif media_type == 'series':
-            # Convert sorted list back to the correct format with positive years
-            return [ (title, -year) for year, title in self.sorted_series ]
+            # Get sorted series with details
+            return [(title, -year, self.series[title][1], self.series[title][2]) for year, title in self.sorted_series]
 
 # Example usage:
 if __name__ == "__main__":
     media_list = RecentList()
 
     # Adding entries
-    media_list.add_entry("Film A", 2022, 'film')
-    media_list.add_entry("Series A", 2023, 'series')
-    media_list.add_entry("Film B", 2021, 'film')
-    media_list.add_entry("Film A", 2024, 'film')  # Updating the year of "Film A"
-    media_list.add_entry("Series B", 2021, 'series')
+    media_list.add_entry("Film A", 2022, "Description A", "http://link-to-image-a.com", 'film')
+    media_list.add_entry("Series A", 2023, "Description B", "http://link-to-image-b.com", 'series')
+    media_list.add_entry("Film B", 2021, "Description C", "http://link-to-image-c.com", 'film')
+    media_list.add_entry("Film A", 2024, "Updated Description A", "http://updated-link-to-image-a.com", 'film')  # Updating the year of "Film A"
+    media_list.add_entry("Series B", 2021, "Description D", "http://link-to-image-d.com", 'series')
 
     # Retrieving and printing sorted entries
     print("Sorted Films:")
-    for title, year in media_list.get_sorted_entries('film'):
-        print(f"Title: {title}, Year: {year}")
+    for title, year, description, image_link in media_list.get_sorted_entries('film'):
+        print(f"Title: {title}, Year: {year}, Description: {description}, Image Link: {image_link}")
 
     print("\nSorted Series:")
-    for title, year in media_list.get_sorted_entries('series'):
-        print(f"Title: {title}, Year: {year}")
+    for title, year, description, image_link in media_list.get_sorted_entries('series'):
+        print(f"Title: {title}, Year: {year}, Description: {description}, Image Link: {image_link}")

tvdb.py

@@ -119,11 +119,30 @@ async def fetch_and_cache_json(original_title, title, media_type, year=None):
             response = requests.get(extended_url, headers=headers)
             response.raise_for_status()
             extended_data = response.json()
-            cleaned_data=clean_data(extended_data)
+            cleaned_data = clean_data(extended_data)
+
+            # Extract the English description
+            description = None
+            if cleaned_data['data']['translations'] and cleaned_data['data']['translations']['overviewTranslations']:
+                for overview in cleaned_data['data']['translations']['overviewTranslations']:
+                    if overview['language'] == 'eng' and overview['isPrimary']:
+                        description = overview['overview']
+                        break
+
+            # Extract the artwork type 15 link
+            image_link = None
+            if cleaned_data['data']['artworks']:
+                for artwork in cleaned_data['data']['artworks']:
+                    if artwork['type'] == 15:
+                        image_link = artwork['image']
+                        break
+
+            # Add the entry to the RecentList with description and image_link
             if media_type == 'movie':
-                recent_list.add_entry(original_title, cleaned_data['data']['year'], 'film')
+                recent_list.add_entry(original_title, cleaned_data['data']['year'], description, image_link, 'film')
             elif media_type == 'series':
-                recent_list.add_entry(original_title,  cleaned_data['data']['year'], 'series')
+                recent_list.add_entry(original_title, cleaned_data['data']['year'], description, image_link, 'series')
+
             # Cache the extended JSON response
             json_cache_path = os.path.join(CACHE_DIR, f"{urllib.parse.quote(original_title)}.json")
             await save_to_json(cleaned_data, json_cache_path)