Merge pull request #652 from meisnate12/develop

v1.15.1

.gitignore

@@ -9,7 +9,7 @@ __pycache__/
 # Distribution / packaging
 .idea
 .Python
-/test.py
+/test*
 logs/
 config/*
 !config/overlays/

README.md

@@ -57,6 +57,7 @@ Before posting on GitHub about an enhancement, error, or configuration question
 ## Wiki Table of Contents
 - [Home](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Home)
 - [Installation](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Installation)
+- [Run Commands & Environmental Variables](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Run-Commands-&-Environmental-Variables)
   - [Local Walkthrough](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Local-Walkthrough)
   - [Docker Walkthrough](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Docker-Walkthrough)
   - [unRAID Walkthrough](https://github.com/meisnate12/Plex-Meta-Manager/wiki/unRAID-Walkthrough)
@@ -79,9 +80,9 @@ Before posting on GitHub about an enhancement, error, or configuration question
   - [MyAnimeList Attributes](https://github.com/meisnate12/Plex-Meta-Manager/wiki/MyAnimeList-Attributes)
 - [Metadata and Playlist Files](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Metadata-and-Playlist-Files)
   - Metadata
-    - [Movies Metadata](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Movies-Metadata)
-    - [Shows Metadata](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Shows-Metadata)
-    - [Artists Metadata](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Artists-Metadata)
+    - [Movie Library Metadata](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Movie-Library-Metadata)
+    - [TV Show Library Metadata](https://github.com/meisnate12/Plex-Meta-Manager/wiki/TV-Show-Library-Metadata)
+    - [Music Library Metadata](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Music-Library-Metadata)
   - [Templates](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Templates)
   - [Filters](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Filters)
   - Builders
@@ -92,6 +93,7 @@ Before posting on GitHub about an enhancement, error, or configuration question
     - [IMDb Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/IMDb-Builders)
     - [Trakt Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Trakt-Builders)
     - [Tautulli Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Tautulli-Builders)
+    - [MdbList Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/MdbList-Builders)
     - [Letterboxd Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Letterboxd-Builders)
     - [ICheckMovies Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/ICheckMovies-Builders)
     - [FlixPatrol Builders](https://github.com/meisnate12/Plex-Meta-Manager/wiki/FlixPatrol-Builders)

VERSION

@@ -1 +1 @@
-1.15.0
+1.15.1

config/config.yml.template

@@ -26,6 +26,8 @@ settings:                                       # Can be individually specified
   dimensional_asset_rename: false
   download_url_assets: false
   show_missing_season_assets: false
+  show_missing_episode_assets: false
+  show_asset_not_needed: true
   sync_mode: append
   minimum_items: 1
   default_collection_order:
@@ -43,6 +45,7 @@ settings:                                       # Can be individually specified
   tvdb_language: eng
   ignore_ids:
   ignore_imdb_ids:
+  item_refresh_delay: 0
   playlist_sync_to_user: all
   verify_ssl: true
 webhooks:                                       # Can be individually specified per library as well

modules/config.py

@@ -54,6 +54,7 @@ def __init__(self, default_dir, attrs, read_only):
         self.run_hour = datetime.strptime(attrs["time"], "%H:%M").hour
         self.requested_collections = util.get_list(attrs["collections"]) if "collections" in attrs else None
         self.requested_libraries = util.get_list(attrs["libraries"]) if "libraries" in attrs else None
+        self.requested_metadata_files = util.get_list(attrs["metadata_files"]) if "metadata_files" in attrs else None
         self.resume_from = attrs["resume"] if "resume" in attrs else None
 
         yaml.YAML().allow_duplicate_keys = True
@@ -126,6 +127,8 @@ def hooks(attr):
                 temp = new_config.pop("settings")
                 if "collection_minimum" in temp:
                     temp["minimum_items"] = temp.pop("collection_minimum")
+                if "playlist_sync_to_user" in temp:
+                    temp["playlist_sync_to_users"] = temp.pop("playlist_sync_to_user")
                 new_config["settings"] = temp
             if "webhooks" in new_config:
                 temp = new_config.pop("webhooks")
@@ -266,9 +269,12 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
             "dimensional_asset_rename": check_for_attribute(self.data, "dimensional_asset_rename", parent="settings", var_type="bool", default=False),
             "download_url_assets": check_for_attribute(self.data, "download_url_assets", parent="settings", var_type="bool", default=False),
             "show_missing_season_assets": check_for_attribute(self.data, "show_missing_season_assets", parent="settings", var_type="bool", default=False),
+            "show_missing_episode_assets": check_for_attribute(self.data, "show_missing_episode_assets", parent="settings", var_type="bool", default=False),
+            "show_asset_not_needed": check_for_attribute(self.data, "show_asset_not_needed", parent="settings", var_type="bool", default=True),
             "sync_mode": check_for_attribute(self.data, "sync_mode", parent="settings", default="append", test_list=sync_modes),
             "default_collection_order": check_for_attribute(self.data, "default_collection_order", parent="settings", default_is_none=True),
             "minimum_items": check_for_attribute(self.data, "minimum_items", parent="settings", var_type="int", default=1),
+            "item_refresh_delay": check_for_attribute(self.data, "item_refresh_delay", parent="settings", var_type="int", default=0),
             "delete_below_minimum": check_for_attribute(self.data, "delete_below_minimum", parent="settings", var_type="bool", default=False),
             "delete_not_scheduled": check_for_attribute(self.data, "delete_not_scheduled", parent="settings", var_type="bool", default=False),
             "run_again_delay": check_for_attribute(self.data, "run_again_delay", parent="settings", var_type="int", default=0),
@@ -283,10 +289,12 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
             "tvdb_language": check_for_attribute(self.data, "tvdb_language", parent="settings", default="default"),
             "ignore_ids": check_for_attribute(self.data, "ignore_ids", parent="settings", var_type="int_list", default_is_none=True),
             "ignore_imdb_ids": check_for_attribute(self.data, "ignore_imdb_ids", parent="settings", var_type="list", default_is_none=True),
-            "playlist_sync_to_user": check_for_attribute(self.data, "playlist_sync_to_user", parent="settings", default="all", default_is_none=True),
+            "playlist_sync_to_users": check_for_attribute(self.data, "playlist_sync_to_users", parent="settings", default="all", default_is_none=True),
             "verify_ssl": check_for_attribute(self.data, "verify_ssl", parent="settings", var_type="bool", default=True),
+            "custom_repo": check_for_attribute(self.data, "custom_repo", parent="settings", default_is_none=True),
             "assets_for_all": check_for_attribute(self.data, "assets_for_all", parent="settings", var_type="bool", default=False, save=False, do_print=False)
         }
+        self.custom_repo = self.general["custom_repo"]
 
         self.session = requests.Session()
         if not self.general["verify_ssl"]:
@@ -412,7 +420,7 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
                 except Failed as e:
                     self.errors.append(e)
                     logger.error(e)
-                logger.info(f"My Anime List Connection {'Failed Continuing as Guest ' if self.MyAnimeList is None else 'Successful'}")
+                logger.info(f"AniDB Connection {'Failed Continuing as Guest ' if self.MyAnimeList is None else 'Successful'}")
             if self.AniDB is None:
                 self.AniDB = AniDB(self, None)
 
@@ -443,6 +451,9 @@ def check_dict(attr):
                         git = check_dict("git")
                         if git:
                             playlists_pairs.append(("Git", git))
+                        repo = check_dict("repo")
+                        if repo:
+                            playlists_pairs.append(("Repo", repo))
                         file = check_dict("file")
                         if file:
                             playlists_pairs.append(("File", file))
@@ -575,7 +586,10 @@ def check_dict(attr):
                 params["dimensional_asset_rename"] = check_for_attribute(lib, "dimensional_asset_rename", parent="settings", var_type="bool", default=self.general["dimensional_asset_rename"], do_print=False, save=False)
                 params["download_url_assets"] = check_for_attribute(lib, "download_url_assets", parent="settings", var_type="bool", default=self.general["download_url_assets"], do_print=False, save=False)
                 params["show_missing_season_assets"] = check_for_attribute(lib, "show_missing_season_assets", parent="settings", var_type="bool", default=self.general["show_missing_season_assets"], do_print=False, save=False)
+                params["show_missing_episode_assets"] = check_for_attribute(lib, "show_missing_episode_assets", parent="settings", var_type="bool", default=self.general["show_missing_episode_assets"], do_print=False, save=False)
+                params["show_asset_not_needed"] = check_for_attribute(lib, "show_asset_not_needed", parent="settings", var_type="bool", default=self.general["show_asset_not_needed"], do_print=False, save=False)
                 params["minimum_items"] = check_for_attribute(lib, "minimum_items", parent="settings", var_type="int", default=self.general["minimum_items"], do_print=False, save=False)
+                params["item_refresh_delay"] = check_for_attribute(lib, "item_refresh_delay", parent="settings", var_type="int", default=self.general["item_refresh_delay"], do_print=False, save=False)
                 params["delete_below_minimum"] = check_for_attribute(lib, "delete_below_minimum", parent="settings", var_type="bool", default=self.general["delete_below_minimum"], do_print=False, save=False)
                 params["delete_not_scheduled"] = check_for_attribute(lib, "delete_not_scheduled", parent="settings", var_type="bool", default=self.general["delete_not_scheduled"], do_print=False, save=False)
                 params["delete_unmanaged_collections"] = check_for_attribute(lib, "delete_unmanaged_collections", parent="settings", var_type="bool", default=False, do_print=False, save=False)
@@ -653,8 +667,14 @@ def check_dict(attr):
                             if lib["operations"]["genre_mapper"] and isinstance(lib["operations"]["genre_mapper"], dict):
                                 params["genre_mapper"] = {}
                                 for new_genre, old_genres in lib["operations"]["genre_mapper"].items():
-                                    for old_genre in util.get_list(old_genres, split=False):
-                                        params["genre_mapper"][old_genre] = new_genre
+                                    if old_genres is None:
+                                        params["genre_mapper"][new_genre] = old_genres
+                                    else:
+                                        for old_genre in util.get_list(old_genres):
+                                            if old_genre == new_genre:
+                                                logger.error("Config Error: genres cannot be mapped to themselves")
+                                            else:
+                                                params["genre_mapper"][old_genre] = new_genre
                             else:
                                 logger.error("Config Error: genre_mapper is blank")
                         if "genre_collections" in lib["operations"]:
@@ -719,6 +739,7 @@ def check_dict(attr, name):
                                             params["metadata_path"].append((name, path[attr]))
                                 check_dict("url", "URL")
                                 check_dict("git", "Git")
+                                check_dict("repo", "Repo")
                                 check_dict("file", "File")
                                 check_dict("folder", "Folder")
                             else:

modules/convert.py

@@ -75,9 +75,9 @@ def anidb_to_ids(self, anidb_ids, library):
             elif anidb_id in self.anidb_to_tvdb:
                 ids.append((self.anidb_to_tvdb[anidb_id], "tvdb"))
             elif anidb_id in self.anidb_ids:
-                logger.error(f"Convert Error: No TVDb ID or IMDb ID found for AniDB ID: {anidb_id}")
+                logger.warning(f"Convert Error: No TVDb ID or IMDb ID found for AniDB ID: {anidb_id}")
             else:
-                logger.error(f"Convert Error: AniDB ID: {anidb_id} not found")
+                logger.warning(f"Convert Error: AniDB ID: {anidb_id} not found")
         return ids
 
     def anilist_to_ids(self, anilist_ids, library):
@@ -86,7 +86,7 @@ def anilist_to_ids(self, anilist_ids, library):
             if anilist_id in self.anilist_to_anidb:
                 anidb_ids.append(self.anilist_to_anidb[anilist_id])
             else:
-                logger.error(f"Convert Error: AniDB ID not found for AniList ID: {anilist_id}")
+                logger.warning(f"Convert Error: AniDB ID not found for AniList ID: {anilist_id}")
         return self.anidb_to_ids(anidb_ids, library)
 
     def myanimelist_to_ids(self, mal_ids, library):
@@ -97,7 +97,7 @@ def myanimelist_to_ids(self, mal_ids, library):
             elif int(mal_id) in self.mal_to_anidb:
                 ids.extend(self.anidb_to_ids(self.mal_to_anidb[int(mal_id)], library))
             else:
-                logger.error(f"Convert Error: AniDB ID not found for MyAnimeList ID: {mal_id}")
+                logger.warning(f"Convert Error: AniDB ID not found for MyAnimeList ID: {mal_id}")
         return ids
 
     def tmdb_to_imdb(self, tmdb_id, is_movie=True, fail=False):

modules/library.py

@@ -1,4 +1,4 @@
-import logging, os, requests, shutil, time
+import logging, os, shutil, time
 from abc import ABC, abstractmethod
 from modules import util
 from modules.meta import MetadataFile
@@ -46,9 +46,12 @@ def __init__(self, config, params):
         self.dimensional_asset_rename = params["dimensional_asset_rename"]
         self.download_url_assets = params["download_url_assets"]
         self.show_missing_season_assets = params["show_missing_season_assets"]
+        self.show_missing_episode_assets = params["show_missing_episode_assets"]
+        self.show_asset_not_needed = params["show_asset_not_needed"]
         self.sync_mode = params["sync_mode"]
         self.default_collection_order = params["default_collection_order"]
         self.minimum_items = params["minimum_items"]
+        self.item_refresh_delay = params["item_refresh_delay"]
         self.delete_below_minimum = params["delete_below_minimum"]
         self.delete_not_scheduled = params["delete_not_scheduled"]
         self.missing_only_released = params["missing_only_released"]
@@ -85,12 +88,12 @@ def __init__(self, config, params):
         self.stats = {"created": 0, "modified": 0, "deleted": 0, "added": 0, "unchanged": 0, "removed": 0, "radarr": 0, "sonarr": 0}
         self.status = {}
 
-        self.tmdb_library_operation = self.assets_for_all or self.mass_genre_update or self.mass_audience_rating_update \
-                                      or self.mass_critic_rating_update or self.mass_trakt_rating_update \
+        self.items_library_operation = self.assets_for_all or self.mass_genre_update or self.mass_audience_rating_update \
+                                      or self.mass_critic_rating_update or self.mass_trakt_rating_update or self.genre_mapper \
                                       or self.tmdb_collections or self.radarr_add_all_existing or self.sonarr_add_all_existing
-        self.library_operation = self.tmdb_library_operation or self.delete_unmanaged_collections or self.delete_collections_with_less \
+        self.library_operation = self.items_library_operation or self.delete_unmanaged_collections or self.delete_collections_with_less \
                                  or self.radarr_remove_by_tag or self.sonarr_remove_by_tag or self.mass_collection_mode \
-                                 or self.genre_collections or self.genre_mapper or self.show_unmanaged
+                                 or self.genre_collections or self.show_unmanaged
         metadata = []
         for file_type, metadata_file in self.metadata_path:
             if file_type == "Folder":
@@ -143,7 +146,7 @@ def upload_images(self, item, poster=None, background=None, overlay=None):
                     self._upload_image(item, poster)
                     poster_uploaded = True
                     logger.info(f"Detail: {poster.attribute} updated {poster.message}")
-                else:
+                elif self.show_asset_not_needed:
                     logger.info(f"Detail: {poster.prefix}poster update not needed")
             except Failed:
                 util.print_stacktrace()
@@ -193,7 +196,7 @@ def upload_images(self, item, poster=None, background=None, overlay=None):
                     self._upload_image(item, background)
                     background_uploaded = True
                     logger.info(f"Detail: {background.attribute} updated {background.message}")
-                else:
+                elif self.show_asset_not_needed:
                     logger.info(f"Detail: {background.prefix}background update not needed")
             except Failed:
                 util.print_stacktrace()

modules/mdblist.py

@@ -1,19 +1,20 @@
 import logging
 from modules import util
 from modules.util import Failed
+from urllib.parse import urlparse
 
 logger = logging.getLogger("Plex Meta Manager")
 
 builders = ["mdblist_list"]
 base_url = "https://mdblist.com/lists"
 
-headers = { 'User-Agent': 'Plex-Meta-Manager' }
+headers = {"User-Agent": "Plex-Meta-Manager"}
 
 class Mdblist:
     def __init__(self, config):
         self.config = config
 
-    def validate_mdb_lists(self, mdb_lists, language):
+    def validate_mdblist_lists(self, mdb_lists):
         valid_lists = []
         for mdb_dict in util.get_list(mdb_lists, split=False):
             if not isinstance(mdb_dict, dict):
@@ -49,7 +50,9 @@ def get_mdblist_ids(self, method, data):
         if method == "mdblist_list":
             limit_status = f" Limit at: {data['limit']} items" if data['limit'] > 0 else ''
             logger.info(f"Processing Mdblist.com List: {data['url']}{limit_status}")
-            url = f"{data['url']}?limit={data['limit']}"
-            return [(i["imdb_id"], "imdb") for i in self.config.get_json(url,headers=headers)]
+            parsed_url = urlparse(data["url"])
+            url_base = parsed_url._replace(query=None).geturl()
+            params = {"limit": data["limit"]} if data["limit"] > 0 else None
+            return [(i["imdb_id"], "imdb") for i in self.config.get_json(url_base, headers=headers, params=params)]
         else:
             raise Failed(f"Mdblist Error: Method {method} not supported")