From d20df5f2585f3ce5b38d07ca77659cbc7a1d5881 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Fri, 6 Aug 2021 14:45:15 -0400 Subject: [PATCH] fix glob error --- modules/plex.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/plex.py b/modules/plex.py index 475f7e2d..b5926b68 100644 --- a/modules/plex.py +++ b/modules/plex.py @@ -733,8 +733,6 @@ class Plex: _item_tags = [] _add = [f"{t[:1].upper()}{t[1:]}" for t in _add_tags + _sync_tags if t.lower() not in _item_tags] _remove = [t for t in _item_tags if (_sync_tags and t not in _sync_tags) or t in _remove_tags] - logger.debug(_add) - logger.debug(_remove) if _add: updated = True self.query_data(getattr(obj, f"add{attr.capitalize()}"), _add) @@ -747,6 +745,7 @@ class Plex: def update_item_from_assets(self, item, overlay=None, create=False): name = os.path.basename(os.path.dirname(str(item.locations[0])) if self.is_movie else str(item.locations[0])) + glob_name = name.translate({ord("["): "[[]", ord("]"): "[]]"}) if "[" in name else name logger.debug(name) found_folder = False poster = None @@ -757,7 +756,7 @@ class Plex: if os.path.isdir(os.path.join(ad, name)): item_dir = os.path.join(ad, name) else: - matches = glob.glob(os.path.join(ad, "*", name)) + matches = glob.glob(os.path.join(ad, "*", glob_name)) if len(matches) > 0: item_dir = os.path.abspath(matches[0]) if item_dir is None: @@ -766,8 +765,8 @@ class Plex: poster_filter = os.path.join(item_dir, "poster.*") background_filter = os.path.join(item_dir, "background.*") else: - poster_filter = os.path.join(ad, f"{name}.*") - background_filter = os.path.join(ad, f"{name}_background.*") + poster_filter = os.path.join(ad, f"{glob_name}.*") + background_filter = os.path.join(ad, f"{glob_name}_background.*") 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) @@ -781,7 +780,7 @@ class Plex: if item_dir: season_filter = os.path.join(item_dir, f"Season{'0' if season.seasonNumber < 10 else ''}{season.seasonNumber}.*") else: - season_filter = os.path.join(ad, f"{name}_Season{'0' if season.seasonNumber < 10 else ''}{season.seasonNumber}.*") + season_filter = os.path.join(ad, f"{glob_name}_Season{'0' if season.seasonNumber < 10 else ''}{season.seasonNumber}.*") matches = glob.glob(season_filter) if len(matches) > 0: season_poster = ImageData("asset_directory", os.path.abspath(matches[0]), prefix=f"{item.title} Season {season.seasonNumber}'s ", is_url=False) @@ -790,7 +789,7 @@ class Plex: if item_dir: episode_filter = os.path.join(item_dir, f"{episode.seasonEpisode.upper()}.*") else: - episode_filter = os.path.join(ad, f"{name}_{episode.seasonEpisode.upper()}.*") + episode_filter = os.path.join(ad, f"{glob_name}_{episode.seasonEpisode.upper()}.*") matches = glob.glob(episode_filter) 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) @@ -808,17 +807,18 @@ class Plex: def find_collection_assets(self, item, name=None, create=False): if name is None: name = item.title + glob_name = name.translate({ord("["): "[[]", ord("]"): "[]]"}) if "[" in name else name for ad in self.asset_directory: poster = None background = None if self.asset_folders: if not os.path.isdir(os.path.join(ad, name)): continue - poster_filter = os.path.join(ad, name, "poster.*") - background_filter = os.path.join(ad, name, "background.*") + poster_filter = os.path.join(ad, glob_name, "poster.*") + background_filter = os.path.join(ad, glob_name, "background.*") else: - poster_filter = os.path.join(ad, f"{name}.*") - background_filter = os.path.join(ad, f"{name}_background.*") + poster_filter = os.path.join(ad, f"{glob_name}.*") + background_filter = os.path.join(ad, f"{glob_name}_background.*") 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)