From 66b3bcfee8a8504ae72131dc889a2586fd3b0ab2 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Thu, 30 Jun 2022 09:48:19 -0400 Subject: [PATCH] [5] fix blur --- VERSION | 2 +- modules/library.py | 3 ++- modules/overlays.py | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index fc75bad4..0f638e05 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.1-develop4 +1.17.1-develop5 diff --git a/modules/library.py b/modules/library.py index 06b75b76..13a02680 100644 --- a/modules/library.py +++ b/modules/library.py @@ -159,7 +159,8 @@ class Library(ABC): test = [la.tag for la in self.item_labels(item)] if overlay and "Overlay" in test: item.removeLabel("Overlay") - item.saveEdits() + if isinstance(item._edits, dict): + item.saveEdits() self._upload_image(item, poster) poster_uploaded = True logger.info(f"Detail: {poster.attribute} updated {poster.message}") diff --git a/modules/overlays.py b/modules/overlays.py index 1bf7d6bc..9b307324 100644 --- a/modules/overlays.py +++ b/modules/overlays.py @@ -90,20 +90,20 @@ class Overlays: applied_names = [] queue_overlays = {} for over_name in over_names: - if over_name.startswith("blur"): - blur_test = int(re.search("\\(([^)]+)\\)", over_name).group(1)) + overlay = properties[over_name] + if overlay.name.startswith("blur"): + logger.info(over_name) + blur_test = int(re.search("\\(([^)]+)\\)", overlay.name).group(1)) if blur_test > blur_num: blur_num = blur_test + elif overlay.queue: + if overlay.queue not in queue_overlays: + queue_overlays[overlay.queue] = {} + if overlay.weight in queue_overlays[overlay.queue]: + raise Failed("Overlay Error: Overlays in a queue cannot have the same weight") + queue_overlays[overlay.queue][overlay.weight] = over_name else: - overlay = properties[over_name] - if overlay.queue: - if overlay.queue not in queue_overlays: - queue_overlays[overlay.queue] = {} - if overlay.weight in queue_overlays[overlay.queue]: - raise Failed("Overlay Error: Overlays in a queue cannot have the same weight") - queue_overlays[overlay.queue][overlay.weight] = over_name - else: - applied_names.append(over_name) + applied_names.append(over_name) overlay_change = False if has_overlay else True if not overlay_change: