feat(update): ✨ utilize tag list instead of 2 genre system

djdembeck · Oct 3, 2021 · 7cd863f · 7cd863f
1 parent 2be2b5b
commit 7cd863f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py
@@ -7,7 +7,6 @@
 from logging import Logging
 from search_tools import SearchTool
 from update_tools import UpdateTool
-from urls import SiteUrl
 from _version import version
 
 VERSION_NO = version
@@ -296,19 +295,13 @@ def update(self, metadata, media, lang, force=False):
             .strip()
         )
 
-        # Handle single genre result
-        if update_helper.genre_child:
-            genre_string = (
-                update_helper.genre_parent + ', ' + update_helper.genre_child
-            )
-        else:
-            genre_string = update_helper.genre_parent
-
         # Setup logging of all data in the array
         data_to_log = [
             {'author': update_helper.author},
             {'date': update_helper.date},
-            {'genres': genre_string},
+            {'genres': ', '.join(
+                genre['name'] for genre in update_helper.genres
+            )},
             {'narrator': update_helper.narrator},
             {'rating': update_helper.rating},
             {'series': update_helper.series},
@@ -559,10 +552,9 @@ def add_genres(self, helper):
         """
         if not Prefs['no_overwrite_genre']:
             helper.metadata.genres.clear()
-            helper.metadata.genres.add(helper.genre_parent)
-            # Not all books have 2 genres
-            if helper.genre_child:
-                helper.metadata.genres.add(helper.genre_child)
+            for genre in helper.genres:
+                if genre['name']:
+                    helper.metadata.genres.add(genre['name'])
 
     def add_narrators_to_styles(self, helper):
         """

diff --git a/Contents/Code/update_tools.py b/Contents/Code/update_tools.py
@@ -11,8 +11,7 @@ class UpdateTool:
     def __init__(self, force, lang, media, metadata):
         self.date = None
         self.force = force
-        self.genre_child = None
-        self.genre_parent = None
+        self.genres = None
         self.lang = lang
         self.media = media
         self.metadata = metadata
@@ -32,11 +31,7 @@ def parse_api_response(self, response):
         if 'releaseDate' in response:
             self.date = response['releaseDate']
         if 'genres' in response:
-            for genre in response['genres']:
-                if genre['type'] == 'parent':
-                    self.genre_parent = genre['name']
-                else:
-                    self.genre_child = genre['name']
+            self.genres = response['genres']
         if 'narrators' in response:
             self.narrator = response['narrators']
         if 'rating' in response: