diff --git a/VERSION b/VERSION index 5ae06e3a..4ac615dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.0-develop59 +1.18.0-develop60 diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml index e285bb9f..51f89bf1 100644 --- a/defaults/overlays/resolution.yml +++ b/defaults/overlays/resolution.yml @@ -133,7 +133,7 @@ templates: - filepath.regex: - <> - <> - - 'edition-(?i)\b(4k )?<>(s|ed)?\b' # New TRaSH naming + - '(?i)edition-\b(4k )?<>(s|ed)?\b' # New TRaSH naming - '(?<=[0-9]{4}[)}>\]]\s)\b(4k )?<>(s|ed)?\b' # Original TRaSH naming resolution: diff --git a/modules/operations.py b/modules/operations.py index 113e4583..efe4a841 100644 --- a/modules/operations.py +++ b/modules/operations.py @@ -2,6 +2,7 @@ import os, re from datetime import datetime from modules import plex, util from modules.util import Failed, LimitReached, YAML +from plexapi.exceptions import BadRequest, NotFound logger = util.logger @@ -454,8 +455,12 @@ class Operations: pass if len(batch_display) > 0: - item.saveEdits() - logger.info(f"Batch Edits{batch_display}") + try: + item.saveEdits() + logger.info(f"Batch Edits{batch_display}") + except (NotFound, BadRequest): + logger.stacktrace() + logger.error("Batch Edits Failed") if self.library.mass_poster_update or self.library.mass_background_update: try: diff --git a/modules/plex.py b/modules/plex.py index 21f5048b..900e55d7 100644 --- a/modules/plex.py +++ b/modules/plex.py @@ -761,7 +761,11 @@ class Plex(Library): self._query(key, put=True) def smart_label_check(self, label): - return label in [la.title for la in self.get_tags("label")] + labels = [la.title for la in self.get_tags("label")] + if label in labels: + return True + logger.trace(f"Label not found in Plex. Options: {labels}") + return False def test_smart_filter(self, uri_args): logger.debug(f"Smart Collection Test: {uri_args}")