diff --git a/README.md b/README.md index 8716cb09..12ec1107 100644 --- 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 index acd21927..de42f393 100644 --- a/config/config.yml.template +++ b/config/config.yml.template @@ -1,6 +1,6 @@ ## 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: @@ -8,6 +8,8 @@ settings: # Can be individually specified 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 index d49b089b..9ad6f840 100644 --- a/modules/arms.py +++ b/modules/arms.py @@ -134,32 +134,25 @@ class ArmsAPI: 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 index 13747054..8607ef9f 100644 --- a/plex_meta_manager.py +++ b/plex_meta_manager.py @@ -91,7 +91,7 @@ util.centered("| |_) | |/ _ \\ \\/ / | |\\/| |/ _ \\ __/ _` | | |\\/| |/ _` | '_ util.centered("| __/| | __/> < | | | | __/ || (_| | | | | | (_| | | | | (_| | (_| | __/ | ") util.centered("|_| |_|\\___/_/\\_\\ |_| |_|\\___|\\__\\__,_| |_| |_|\\__,_|_| |_|\\__,_|\\__, |\\___|_| ") util.centered(" |___/ ") -util.centered(" Version: 1.7.2-Beta11 ") +util.centered(" Version: 1.8.0 ") util.separator() if my_tests: