From 65361d0a370e7611d0d1e7f42f172e4024c06e0c Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Tue, 13 Jul 2021 14:00:09 -0400 Subject: [PATCH] fixed true tag issue --- modules/config.py | 4 ++-- modules/plex.py | 17 +++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/modules/config.py b/modules/config.py index b097d5ad..889bb8a5 100644 --- a/modules/config.py +++ b/modules/config.py @@ -476,7 +476,7 @@ class Config: radarr_params["monitor"] = check_for_attribute(lib, "monitor", parent="radarr", var_type="bool", default=self.general["radarr"]["monitor"], save=False) radarr_params["availability"] = check_for_attribute(lib, "availability", parent="radarr", test_list=radarr_availabilities, default=self.general["radarr"]["availability"], save=False) radarr_params["quality_profile"] = check_for_attribute(lib, "quality_profile", parent="radarr", default=self.general["radarr"]["quality_profile"], req_default=True, save=False) - radarr_params["tag"] = check_for_attribute(lib, "search", parent="radarr", var_type="lower_list", default=self.general["radarr"]["tag"], default_is_none=True, save=False) + radarr_params["tag"] = check_for_attribute(lib, "tag", parent="radarr", var_type="lower_list", default=self.general["radarr"]["tag"], default_is_none=True, save=False) radarr_params["search"] = check_for_attribute(lib, "search", parent="radarr", var_type="bool", default=self.general["radarr"]["search"], save=False) library.Radarr = Radarr(radarr_params) except Failed as e: @@ -505,7 +505,7 @@ class Config: sonarr_params["language_profile"] = check_for_attribute(lib, "language_profile", parent="sonarr", default_is_none=True, save=False) sonarr_params["series_type"] = check_for_attribute(lib, "series_type", parent="sonarr", test_list=sonarr_series_types, default=self.general["sonarr"]["series_type"], save=False) sonarr_params["season_folder"] = check_for_attribute(lib, "season_folder", parent="sonarr", var_type="bool", default=self.general["sonarr"]["season_folder"], save=False) - sonarr_params["tag"] = check_for_attribute(lib, "search", parent="sonarr", var_type="lower_list", default=self.general["sonarr"]["tag"], default_is_none=True, save=False) + sonarr_params["tag"] = check_for_attribute(lib, "tag", parent="sonarr", var_type="lower_list", default=self.general["sonarr"]["tag"], default_is_none=True, save=False) sonarr_params["search"] = check_for_attribute(lib, "search", parent="sonarr", var_type="bool", default=self.general["sonarr"]["search"], save=False) sonarr_params["cutoff_search"] = check_for_attribute(lib, "cutoff_search", parent="sonarr", var_type="bool", default=self.general["sonarr"]["cutoff_search"], save=False) library.Sonarr = Sonarr(sonarr_params) diff --git a/modules/plex.py b/modules/plex.py index 93fb76ed..eff47a7f 100644 --- a/modules/plex.py +++ b/modules/plex.py @@ -769,18 +769,9 @@ class Plex: return updated def update_item_from_assets(self, item, overlay=None): - logger.debug(item.locations) - logger.debug(item.locations[0]) - logger.debug(os.path.dirname(str(item.locations[0]))) - logger.debug(os.path.basename(os.path.dirname(str(item.locations[0])))) - logger.debug(os.path.dirname(os.path.abspath(item.locations[0]))) - logger.debug(os.path.basename(os.path.dirname(os.path.abspath(item.locations[0])))) - - name = os.path.basename(os.path.dirname(str(item.locations[0])) if self.is_movie else str(item.locations[0])) logger.debug(name) found_folder = False - uploaded = False for ad in self.asset_directory: poster = None background = None @@ -800,11 +791,9 @@ class Plex: else: poster_filter = os.path.join(ad, f"{name}.*") background_filter = os.path.join(ad, f"{name}_background.*") - logger.debug(f"Poster Filter: {poster_filter}") matches = glob.glob(poster_filter) if len(matches) > 0: poster = ImageData("asset_directory", os.path.abspath(matches[0]), prefix=f"{item.title}'s ", is_url=False) - logger.debug(f"Background Filter: {background_filter}") matches = glob.glob(background_filter) if len(matches) > 0: background = ImageData("asset_directory", os.path.abspath(matches[0]), prefix=f"{item.title}'s ", is_poster=False, is_url=False) @@ -829,12 +818,12 @@ class Plex: if len(matches) > 0: episode_poster = ImageData("asset_directory", os.path.abspath(matches[0]), prefix=f"{item.title} {episode.seasonEpisode.upper()}'s ", is_url=False) self.upload_images(episode, poster=episode_poster) - if not found_folder and overlay: + if not poster and overlay: self.upload_images(item, overlay=overlay) - elif self.asset_folders and not found_folder: + if not overlay and self.asset_folders and not found_folder: logger.error(f"Asset Warning: No asset folder found called '{name}'") elif not poster and not background: - logger.error(f"Asset Warning: No poster or background found in an assets folder for {name}") + logger.error(f"Asset Warning: No poster or background found in an assets folder for '{name}'") def find_collection_assets(self, item, name=None): if name is None: