Merge pull request #30 from meisnate12/develop

v1.1.0
Kometa-Team · Feb 14, 2021 · f25a139 · f25a139
2 parents dc93cbd + 334ae30
commit f25a139
Show file tree

Hide file tree

Showing 8 changed files with 184 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Plex Meta Manager
-#### Version 1.0.3
+#### Version 1.1.0
 
 The original concept for Plex Meta Manager is [Plex Auto Collections](https://github.com/mza921/Plex-Auto-Collections), but this is rewritten from the ground up to be able to include a scheduler, metadata edits, multiple libraries, and logging. Plex Meta Manager is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki. Some collection examples that the script can automatically build and update daily include Plex Based Searches like actor, genre, or studio collections or Collections based on TMDb, IMDb, Trakt, TVDb, AniDB, or MyAnimeList lists and various other services.
 
@@ -17,6 +17,6 @@ The script is designed to work with most Metadata agents including the new Plex
 
 * If you're getting an Error or have an Enhancement post in the [Issues](https://github.com/meisnate12/Plex-Meta-Manager/issues)
 * If you have a configuration question visit the [Discussions](https://github.com/meisnate12/Plex-Meta-Manager/discussions)
-* To see user submited Metadata configuration files and you could even add your own go to the [Plex Meta Manager Configs](https://github.com/meisnate12/Plex-Meta-Manager-Configs)
+* To see user submitted Metadata configuration files and you could even add your own go to the [Plex Meta Manager Configs](https://github.com/meisnate12/Plex-Meta-Manager-Configs)
 * Pull Request are welcome
 * [Buy Me a Pizza](https://www.buymeacoffee.com/meisnate12)
diff --git a/config/config.yml.template b/config/config.yml.template
@@ -13,7 +13,8 @@ plex:                                         # Can be individually specified pe
   token: ####################
   sync_mode: append
   asset_directory: config/assets
-  show_unmanaged_collections: true
+  show_unmanaged: true
+  show_filtered: false
 radarr:                                         # Can be individually specified per library as well
   url: http://192.168.1.12:7878
   token: ################################

diff --git a/modules/anidb.py b/modules/anidb.py
@@ -23,9 +23,12 @@ def convert_anidb_to_imdb(self, anidb_id):          return self.convert_anidb(an
     def convert_tvdb_to_anidb(self, tvdb_id):           return self.convert_anidb(tvdb_id, "tvdbid", "anidbid")
     def convert_imdb_to_anidb(self, imdb_id):           return self.convert_anidb(imdb_id, "imdbid", "anidbid")
     def convert_anidb(self, input_id, from_id, to_id):
-        ids = self.id_list.xpath("//anime[@{}='{}']/@{}".format(from_id, input_id, to_id))
+        ids = self.id_list.xpath("//anime[contains(@{}, '{}')]/@{}".format(from_id, input_id, to_id))
         if len(ids) > 0:
-            if len(ids[0]) > 0:                                 return ids[0] if to_id == "imdbid" else int(ids[0])
+            if from_id == "tvdbid":                             return [int(id) for id in ids]
+            if len(ids[0]) > 0:
+                try:                                                return ids[0].split(",") if to_id == "imdbid" else int(ids[0])
+                except ValueError:                                  raise Failed("AniDB Error: No {} ID found for {} ID: {}".format(util.pretty_ids[to_id], util.pretty_ids[from_id], input_id))
             else:                                               raise Failed("AniDB Error: No {} ID found for {} ID: {}".format(util.pretty_ids[to_id], util.pretty_ids[from_id], input_id))
         else:                                               raise Failed("AniDB Error: {} ID: {} not found".format(util.pretty_ids[from_id], input_id))
 
@@ -77,7 +80,7 @@ def get_items(self, method, data, language, status_message=True):
         movie_ids = []
         for anidb_id in anime_ids:
             try:
-                tmdb_id, tvdb_id = self.convert_from_imdb(self.convert_anidb_to_imdb(anidb_id), language)
+                tmdb_id = self.convert_from_imdb(self.convert_anidb_to_imdb(anidb_id), language)
                 if tmdb_id:                                         movie_ids.append(tmdb_id)
                 else:                                               raise Failed
             except Failed:
@@ -90,27 +93,34 @@ def get_items(self, method, data, language, status_message=True):
         return movie_ids, show_ids
 
     def convert_from_imdb(self, imdb_id, language):
-        if self.Cache:
-            tmdb_id, tvdb_id = self.Cache.get_ids_from_imdb(imdb_id)
-            expired = False
-            if not tmdb_id:
-                tmdb_id, expired = self.Cache.get_tmdb_from_imdb(imdb_id)
-                if expired:
-                    tmdb_id = None
-        else:
-            tmdb_id = None
-        from_cache = tmdb_id is not None
+        output_tmdb_ids = []
+        if not isinstance(imdb_id, list):
+            imdb_id = [imdb_id]
+
+        for imdb in imdb_id:
+            if self.Cache:
+                tmdb_id, tvdb_id = self.Cache.get_ids_from_imdb(imdb)
+                expired = False
+                if not tmdb_id:
+                    tmdb_id, expired = self.Cache.get_tmdb_from_imdb(imdb)
+                    if expired:
+                        tmdb_id = None
+            else:
+                tmdb_id = None
+            from_cache = tmdb_id is not None
 
-        if not tmdb_id and self.TMDb:
-            try:                                        tmdb_id = self.TMDb.convert_imdb_to_tmdb(imdb_id)
-            except Failed:                              pass
-        if not tmdb_id and self.Trakt:
-            try:                                        tmdb_id = self.Trakt.convert_imdb_to_tmdb(imdb_id)
-            except Failed:                              pass
-        try:
-            if tmdb_id and not from_cache:              self.TMDb.get_movie(tmdb_id)
-        except Failed:                              tmdb_id = None
-        if not tmdb_id:                             raise Failed("TVDb Error: No TMDb ID found for IMDb: {}".format(imdb_id))
-        if self.Cache and tmdb_id and expired is not False:
-            self.Cache.update_imdb("movie", expired, imdb_id, tmdb_id)
-        return tmdb_id
+            if not tmdb_id and self.TMDb:
+                try:                                        tmdb_id = self.TMDb.convert_imdb_to_tmdb(imdb)
+                except Failed:                              pass
+            if not tmdb_id and self.Trakt:
+                try:                                        tmdb_id = self.Trakt.convert_imdb_to_tmdb(imdb)
+                except Failed:                              pass
+            try:
+                if tmdb_id and not from_cache:              self.TMDb.get_movie(tmdb_id)
+            except Failed:                              tmdb_id = None
+            if tmdb_id:                                 output_tmdb_ids.append(tmdb_id)
+            if self.Cache and tmdb_id and expired is not False:
+                self.Cache.update_imdb("movie", expired, imdb, tmdb_id)
+        if len(output_tmdb_ids) == 0:               raise Failed("AniDB Error: No TMDb ID found for IMDb: {}".format(imdb_id))
+        elif len(output_tmdb_ids) == 1:             return output_tmdb_ids[0]
+        else:                                       return output_tmdb_ids