v1.8.0

Kometa-Team · Apr 23, 2021 · 342625d · 342625d
1 parent 0504870
commit 342625d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Plex Meta Manager
-#### Version 1.7.2
+#### Version 1.8.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.
 

diff --git a/config/config.yml.template b/config/config.yml.template
@@ -1,13 +1,15 @@
 ## This file is a template remove the .template to use the file
 
-libraries:                                      # Library Names must have a colon (:) placed after them
+libraries:                                      # Library mappings must have a colon (:) placed after them
   Movies:
   TV Shows:
   Anime:
 settings:                                       # Can be individually specified per library as well
   cache: true
   cache_expiration: 60
   asset_directory: config/assets
+  asset_folders: true
+  assets_for_all: false
   sync_mode: append
   show_unmanaged: true
   show_filtered: false

diff --git a/modules/arms.py b/modules/arms.py
@@ -134,32 +134,25 @@ def imdb_to_ids(self, imdb_id, language):
         from_cache = tmdb_id is not None or tvdb_id is not None
 
         if not tmdb_id and not tvdb_id and self.config.TMDb:
-            try:
-                tmdb_id = self.config.TMDb.convert_imdb_to_tmdb(imdb_id)
-            except Failed:
-                pass
+            try:                    tmdb_id = self.config.TMDb.convert_imdb_to_tmdb(imdb_id)
+            except Failed:          pass
         if not tmdb_id and not tvdb_id and self.config.TMDb:
-            try:
-                tvdb_id = self.config.TMDb.convert_imdb_to_tvdb(imdb_id)
-            except Failed:
-                pass
+            try:                    tvdb_id = self.config.TMDb.convert_imdb_to_tvdb(imdb_id)
+            except Failed:          pass
         if not tmdb_id and not tvdb_id and self.config.Trakt:
-            try:
-                tmdb_id = self.config.Trakt.convert_imdb_to_tmdb(imdb_id)
-            except Failed:
-                pass
+            try:                    tmdb_id = self.config.Trakt.convert_imdb_to_tmdb(imdb_id)
+            except Failed:          pass
         if not tmdb_id and not tvdb_id and self.config.Trakt:
-            try:
-                tvdb_id = self.config.Trakt.convert_imdb_to_tvdb(imdb_id)
-            except Failed:
-                pass
-        try:
-            if tmdb_id and not from_cache:              self.config.TMDb.get_movie(tmdb_id)
-        except Failed:                              tmdb_id = None
-        try:
-            if tvdb_id and not from_cache:              self.config.TVDb.get_series(language, tvdb_id)
-        except Failed:                              tvdb_id = None
-        if not tmdb_id and not tvdb_id:             raise Failed(f"Arms Error: No TMDb ID or TVDb ID found for IMDb: {imdb_id}")
+            try:                    tvdb_id = self.config.Trakt.convert_imdb_to_tvdb(imdb_id)
+            except Failed:          pass
+        if tmdb_id and not from_cache:
+            try:                    self.config.TMDb.get_movie(tmdb_id)
+            except Failed:          tmdb_id = None
+        if tvdb_id and not from_cache:
+            try:                    self.config.TVDb.get_series(language, tvdb_id)
+            except Failed:          tvdb_id = None
+        if not tmdb_id and not tvdb_id:
+            raise Failed(f"Arms Error: No TMDb ID or TVDb ID found for IMDb: {imdb_id}")
         if self.config.Cache:
             if tmdb_id and update_tmdb is not False:
                 self.config.Cache.update_imdb("movie", update_tmdb, imdb_id, tmdb_id)

diff --git a/plex_meta_manager.py b/plex_meta_manager.py
@@ -91,7 +91,7 @@ def fmt_filter(record):
 util.centered("|  __/| |  __/>  <  | |  | |  __/ || (_| | | |  | | (_| | | | | (_| | (_| |  __/ |   ")
 util.centered("|_|   |_|\\___/_/\\_\\ |_|  |_|\\___|\\__\\__,_| |_|  |_|\\__,_|_| |_|\\__,_|\\__, |\\___|_|   ")
 util.centered("                                                                     |___/           ")
-util.centered("    Version: 1.7.2-Beta11                                                            ")
+util.centered("    Version: 1.8.0                                                                   ")
 util.separator()
 
 if my_tests: