From c8620695c716c04dc4484540aea5d5efec0c2165 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Thu, 2 Jun 2022 12:39:06 -0400
Subject: [PATCH] fix use_*

---
 PMM/genre.yml                    |   2 +
 PMM/overlays/audio_codec.yml     |   4 +-
 PMM/overlays/resolution.yml      | 104 +++++++------------------------
 PMM/overlays/special_release.yml |   2 +-
 PMM/overlays/video_format.yml    |   2 +-
 5 files changed, 30 insertions(+), 84 deletions(-)

diff --git a/PMM/genre.yml b/PMM/genre.yml
index 8f19a85..79b8cdd 100644
--- a/PMM/genre.yml
+++ b/PMM/genre.yml
@@ -72,6 +72,8 @@ dynamic_collections:
         - Science Fiction & Fantasy
         - Science-Fiction & Fantasy
         - Sci-Fi & Fantasy
+      Film Noir:
+        Film-Noir
       Politics:
         - War & Politics
       Science Fiction:
diff --git a/PMM/overlays/audio_codec.yml b/PMM/overlays/audio_codec.yml
index b647500..2acaa18 100644
--- a/PMM/overlays/audio_codec.yml
+++ b/PMM/overlays/audio_codec.yml
@@ -47,7 +47,7 @@ templates:
   AudioCodec:
     optional:
       - overlay_level
-      - <<use_<<slug>>>>
+      - use_<<slug>>
     default:
       overlay: <<overlay_name>>
       horizontal_offset: 0
@@ -82,7 +82,7 @@ overlays:
       - name: AudioCodec
         overlay: Opus
         weight: 5
-        slug: Opus
+        slug: opus
     plex_all: true
     filters:
       filepath.regex: '(?i)\bOPUS(\b|\d)'
diff --git a/PMM/overlays/resolution.yml b/PMM/overlays/resolution.yml
index b1722f5..c0878da 100644
--- a/PMM/overlays/resolution.yml
+++ b/PMM/overlays/resolution.yml
@@ -41,8 +41,8 @@ templates:
   Resolution:
     optional:
       - overlay_level
-      - <<use_<<opt1>>>>
-      - <<use_<<opt2>>>>
+      - use_<<opt1>>
+      - use_<<opt2>>
     default:
       overlay: <<overlay_name>>
       horizontal_offset: 15
@@ -62,86 +62,30 @@ templates:
       horizontal_align: <<horizontal_align>>
       vertical_offset: <<vertical_offset>>
       vertical_align: <<vertical_align>>
-
-  4K-DV:
+  NoResolution:
     optional:
-      - use_1
-      - use_2
+      - overlay_level
+      - use_<<opt1>>
+      - use_<<opt2>>
+    default:
+      overlay: <<overlay_name>>
+      horizontal_offset: 15
+      horizontal_align: left
+      vertical_offset: 15
+      vertical_align: top
+    collection_level: <<overlay_level>>
     allowed_library_types:
-      - <<use_1>>
-      - <<use_2>>
-
-  4K-HDR:
-    default:
-      use_4k: true
-      use_hdr: true
-    allowed_library_types: <<use_4k>>, <<use_hdr>>
-
-  4K:
-    default:
-      use_4k: true
-    allowed_library_types: <<use_4k>>
-
-  1080P-DV:
-    default:
-      use_1080p: true
-      use_dv: true
-    allowed_library_types: <<use_1080p>>, <<use_dv>>
-
-  1080P-HDR:
-    default:
-      use_1080p: true
-      use_hdr: true
-    allowed_library_types: <<use_1080p>>, <<use_hdr>>
-
-  1080P:
-    default:
-      use_1080p: true
-    allowed_library_types: <<use_1080p>>
-
-  720P-DV:
-    default:
-      use_720p: true
-      use_dv: true
-    allowed_library_types: <<use_720p>>, <<use_dv>>
-
-  720P-HDR:
-    default:
-      use_720p: true
-      use_hdr: true
-    allowed_library_types: <<use_720p>>, <<use_hdr>>
-
-  720P:
-    default:
-      use_720p: true
-    allowed_library_types: <<use_720p>>
-
-  480P-DV:
-    default:
-      use_480p: true
-      use_dv: true
-    allowed_library_types: <<use_480p>>, <<use_dv>>
-
-  480P-HDR:
-    default:
-      use_480p: true
-      use_hdr: true
-    allowed_library_types: <<use_480p>>, <<use_hdr>>
-
-  480P:
-    default:
-      use_480p: true
-    allowed_library_types: <<use_480p>>
-
-  DV:
-    default:
-      use_dv: true
-    allowed_library_types: <<use_dv>>
-
-  HDR:
-    default:
-      use_hdr: true
-    allowed_library_types: <<use_hdr>>
+      - <<use_<<opt1>>>>
+      - <<use_<<opt2>>>>
+    overlay:
+      name: <<overlay_name>>
+      git: PMM/overlays/images/<<overlay>>
+      group: res
+      weight: <<weight>>
+      horizontal_offset: <<horizontal_offset>>
+      horizontal_align: <<horizontal_align>>
+      vertical_offset: <<vertical_offset>>
+      vertical_align: <<vertical_align>>
 
 overlays:
 
diff --git a/PMM/overlays/special_release.yml b/PMM/overlays/special_release.yml
index faf09a6..1789cf9 100644
--- a/PMM/overlays/special_release.yml
+++ b/PMM/overlays/special_release.yml
@@ -35,7 +35,7 @@ templates:
   SpecialRelease:
     optional:
       - overlay_level
-      - <<use_<<slug>>>>
+      - use_<<slug>>
     default:
       overlay: <<overlay_name>>
       horizontal_offset: 15
diff --git a/PMM/overlays/video_format.yml b/PMM/overlays/video_format.yml
index b6aed71..dc78783 100644
--- a/PMM/overlays/video_format.yml
+++ b/PMM/overlays/video_format.yml
@@ -39,7 +39,7 @@ templates:
   VideoFormat:
     optional:
       - overlay_level
-      - <<use_<<slug>>>>
+      - use_<<slug>>
     default:
       overlay: <<overlay_name>>
       horizontal_offset: 15