Improved aggregator character/person image sync logic

hikka-io · Oct 15, 2024 · 569efb3 · 569efb3
1 parent 7ef1c17
commit 569efb3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/app/aggregator/characters.py b/app/aggregator/characters.py
@@ -21,6 +21,8 @@ async def save_characters(session, data):
     add_characters = []
 
     for character_data in data:
+        new_image = False
+
         if not (image := image_cache.get(character_data["image"])):
             if character_data["image"]:
                 image = Image(
@@ -33,6 +35,7 @@ async def save_characters(session, data):
                 )
 
                 image_cache[character_data["image"]] = image
+                new_image = True
 
         updated = utils.from_timestamp(character_data["updated"])
         slug = utils.slugify(
@@ -42,10 +45,14 @@ async def save_characters(session, data):
         if character_data["content_id"] in characters_cache:
             character = characters_cache[character_data["content_id"]]
 
-            if character.updated == updated:
-                continue
-
-            if character.favorites == character_data["favorites"]:
+            # We only skip if there is nothing to update
+            if all(
+                [
+                    character.updated == updated,
+                    character.favorites == character_data["favorites"],
+                    new_image is False,
+                ]
+            ):
                 continue
 
             character.favorites = character_data["favorites"]

diff --git a/app/aggregator/people.py b/app/aggregator/people.py
@@ -21,6 +21,8 @@ async def save_people(session, data):
     add_people = []
 
     for person_data in data:
+        new_image = False
+
         if not (image := image_cache.get(person_data["image"])):
             if person_data["image"]:
                 image = Image(
@@ -33,17 +35,22 @@ async def save_people(session, data):
                 )
 
                 image_cache[person_data["image"]] = image
+                new_image = True
 
         updated = utils.from_timestamp(person_data["updated"])
         slug = utils.slugify(person_data["name_en"], person_data["content_id"])
 
         if person_data["content_id"] in people_cache:
             person = people_cache[person_data["content_id"]]
 
-            if person.updated == updated:
-                continue
-
-            if person.favorites == person_data["favorites"]:
+            # We only skip if there is nothing to update
+            if all(
+                [
+                    person.updated == updated,
+                    person.favorites == person_data["favorites"],
+                    new_image is False,
+                ]
+            ):
                 continue
 
             person.favorites = person_data["favorites"]