From ec5248963ccde320ef3937b42a38cd647c397d01 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Tue, 27 Sep 2022 13:47:49 -0400
Subject: [PATCH] [58] update resolution overlay

---
 VERSION                               |  2 +-
 defaults/overlays/edition.yml         | 44 ++++++++++++++-------------
 defaults/overlays/resolution.yml      | 40 ++++++++++++------------
 defaults/overlays/special_release.yml | 44 ++++++++++++++-------------
 modules/overlay.py                    |  1 -
 5 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/VERSION b/VERSION
index 40b78734..457c2d09 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.3-develop57
+1.17.3-develop58
diff --git a/defaults/overlays/edition.yml b/defaults/overlays/edition.yml
index 2999da9d..18751663 100644
--- a/defaults/overlays/edition.yml
+++ b/defaults/overlays/edition.yml
@@ -63,10 +63,30 @@ templates:
         conditions:
           - dovetail: true
             value: 99
-      dovetail_overlay:
+      suppress_overlays:
         conditions:
+          - dovetail: true
+            value:
+              - 4K-DV
+              - 4K-HDR
+              - 4K
+              - 1080P-DV
+              - 1080P-HDR
+              - 1080P
+              - 720P-DV
+              - 720P-HDR
+              - 720P
+              - 576P-DV
+              - 576P-HDR
+              - 576P
+              - 480P-DV
+              - 480P-HDR
+              - 480P
+              - DV
+              - HDR
           - dovetail: false
-            value: <<overlay_name>>-Dovetail
+            value:
+              - <<overlay_name>>-Dovetail
       back_width:
         conditions:
           - dovetail: false
@@ -89,25 +109,7 @@ templates:
     collection_level: <<overlay_level>>
     allowed_library_types: <<use_<<slug>>>>
     ignore_blank_results: true
-    suppress_overlays:
-      - 4K-DV
-      - 4K-HDR
-      - 4K
-      - 1080P-DV
-      - 1080P-HDR
-      - 1080P
-      - 720P-DV
-      - 720P-HDR
-      - 720P
-      - 576P-DV
-      - 576P-HDR
-      - 576P
-      - 480P-DV
-      - 480P-HDR
-      - 480P
-      - DV
-      - HDR
-      - <<dovetail_overlay>>
+    suppress_overlays: <<suppress_overlays>>
     overlay:
       name: <<overlay_name>>
       pmm: edition/<<slug>>
diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml
index 5e364e0a..fffc6b97 100644
--- a/defaults/overlays/resolution.yml
+++ b/defaults/overlays/resolution.yml
@@ -37,10 +37,28 @@ templates:
         conditions:
           - dovetail: true
             value: 189
-      dovetail_overlay:
+      suppress_overlays:
         conditions:
+          - dovetail: true
+            value:
+              - Directors-Cut
+              - Extended-Edition
+              - Uncut-Edition
+              - Unrated-Edition
+              - Special-Edition
+              - Final-Cut
+              - Anniversary-Edition
+              - Collectors-Edition
+              - International-Cut
+              - Theatrical-Cut
+              - Ultimate-Cut
+              - IMAX-E
+              - IMAX
+              - Remastered
+              - Criterion
           - dovetail: false
-            value: <<overlay_name>>-Dovetail
+            value:
+              - <<overlay_name>>-Dovetail
     optional:
       - overlay_level
       - use_<<resolution>>
@@ -61,23 +79,7 @@ templates:
     allowed_library_types:
       - <<use_<<resolution>>>>
       - <<use_<<alt>>>>
-    suppress_overlays:
-      - Directors-Cut
-      - Extended-Edition
-      - Uncut-Edition
-      - Unrated-Edition
-      - Special-Edition
-      - Final-Cut
-      - Anniversary-Edition
-      - Collectors-Edition
-      - International-Cut
-      - Theatrical-Cut
-      - Ultimate-Cut
-      - IMAX-E
-      - IMAX
-      - Remastered
-      - Criterion
-      - <<dovetail_overlay>>
+    suppress_overlays: <<suppress_overlays>>
     overlay:
       name: <<overlay_name>>
       pmm: resolution/<<resolution>><<alt>>
diff --git a/defaults/overlays/special_release.yml b/defaults/overlays/special_release.yml
index 8a3a5b87..f1205b60 100644
--- a/defaults/overlays/special_release.yml
+++ b/defaults/overlays/special_release.yml
@@ -63,10 +63,30 @@ templates:
         conditions:
           - dovetail: true
             value: 99
-      dovetail_overlay:
+      suppress_overlays:
         conditions:
+          - dovetail: true
+            value:
+              - 4K-DV
+              - 4K-HDR
+              - 4K
+              - 1080P-DV
+              - 1080P-HDR
+              - 1080P
+              - 720P-DV
+              - 720P-HDR
+              - 720P
+              - 576P-DV
+              - 576P-HDR
+              - 576P
+              - 480P-DV
+              - 480P-HDR
+              - 480P
+              - DV
+              - HDR
           - dovetail: false
-            value: <<overlay_name>>-Dovetail
+            value:
+              - <<overlay_name>>-Dovetail
       back_width:
         conditions:
           - dovetail: false
@@ -89,25 +109,7 @@ templates:
     collection_level: <<overlay_level>>
     allowed_library_types: <<use_<<slug>>>>
     ignore_blank_results: true
-    suppress_overlays:
-      - 4K-DV
-      - 4K-HDR
-      - 4K
-      - 1080P-DV
-      - 1080P-HDR
-      - 1080P
-      - 720P-DV
-      - 720P-HDR
-      - 720P
-      - 576P-DV
-      - 576P-HDR
-      - 576P
-      - 480P-DV
-      - 480P-HDR
-      - 480P
-      - DV
-      - HDR
-      - <<dovetail_overlay>>
+    suppress_overlays: <<suppress_overlays>>
     overlay:
       name: <<overlay_name>>
       pmm: edition/<<slug>>
diff --git a/modules/overlay.py b/modules/overlay.py
index b865281e..f60d8b72 100644
--- a/modules/overlay.py
+++ b/modules/overlay.py
@@ -230,7 +230,6 @@ class Overlay:
                 if not temp_path.endswith(".png"):
                     temp_path = f"{temp_path}.png"
                 images_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "defaults", "overlays", "images")
-                logger.debug(os.path.abspath(os.path.join(images_path, temp_path)))
                 if not os.path.exists(os.path.abspath(os.path.join(images_path, temp_path))):
                     raise Failed(f"Overlay Error: Overlay Image not found at: {os.path.abspath(os.path.join(images_path, temp_path))}")
                 self.path = os.path.abspath(os.path.join(images_path, temp_path))