From ddfc2eac17117f6f1f973db051d70b81a6871808 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Tue, 21 Feb 2023 15:30:26 -0500
Subject: [PATCH] [78] remove need for pmm: null

---
 VERSION                              |  2 +-
 defaults/overlays/audio_codec.yml    |  8 +++++++-
 defaults/overlays/commonsense.yml    |  8 +++++++-
 defaults/overlays/direct_play.yml    |  8 +++++++-
 defaults/overlays/flixpatrol.yml     |  9 ++++++++-
 defaults/overlays/language_count.yml |  8 +++++++-
 defaults/overlays/languages.yml      |  8 +++++++-
 defaults/overlays/mediastinger.yml   |  8 +++++++-
 defaults/overlays/ratings.yml        | 11 +++++++++++
 defaults/overlays/resolution.yml     |  8 ++++++++
 defaults/overlays/ribbon.yml         |  9 ++++++++-
 defaults/overlays/streaming.yml      |  8 +++++++-
 defaults/overlays/versions.yml       |  8 +++++++-
 docs/defaults/overlay_variables.md   |  9 ++++-----
 14 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/VERSION b/VERSION
index 26107eb9..bdde5f45 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.18.3-develop77
+1.18.3-develop78
diff --git a/defaults/overlays/audio_codec.yml b/defaults/overlays/audio_codec.yml
index 83441685..6e1fe7d7 100644
--- a/defaults/overlays/audio_codec.yml
+++ b/defaults/overlays/audio_codec.yml
@@ -38,11 +38,17 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: audio_codec/<<style>>/<<key>>
     group: audio_codec
     vertical_offset: 15
     back_color: "#00000099"
     back_width: 305
-    pmm: audio_codec/<<style>>/<<key>>
 
 templates:
   audio_codec:
diff --git a/defaults/overlays/commonsense.yml b/defaults/overlays/commonsense.yml
index 35773bb5..187d916d 100644
--- a/defaults/overlays/commonsense.yml
+++ b/defaults/overlays/commonsense.yml
@@ -45,10 +45,16 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: Commonsense
     back_color: "#00000099"
     back_width: 305
     back_height: 105
-    pmm: Commonsense
     addon_position: left
     addon_offset: 15
     final_name: text(<<pre>><<overlay_name>><<post>>)
diff --git a/defaults/overlays/direct_play.yml b/defaults/overlays/direct_play.yml
index 6785e73a..52f902a3 100644
--- a/defaults/overlays/direct_play.yml
+++ b/defaults/overlays/direct_play.yml
@@ -31,12 +31,18 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: <<overlay_name>>
     horizontal_offset: 0
     horizontal_align: center
     back_color: "#00000099"
     back_width: 305
     back_height: 170
-    pmm: <<overlay_name>>
 
 overlays:
   Direct-Play:
diff --git a/defaults/overlays/flixpatrol.yml b/defaults/overlays/flixpatrol.yml
index 2b825538..5e199f29 100644
--- a/defaults/overlays/flixpatrol.yml
+++ b/defaults/overlays/flixpatrol.yml
@@ -13,6 +13,14 @@ external_templates:
       style: round
       limit: 10
       limit_<<key>>: <<limit>>
+    conditionals:
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: logo/<<style>>/<<key>>
     queue: position
     back_color: "#00000099"
     back_width: 160
@@ -21,7 +29,6 @@ external_templates:
     addon_position: top
     addon_offset: 30
     back_padding: 15
-    pmm: logo/<<style>>/<<key>>
     final_name: text(<<pre_text>><<limit_<<key>>>>)
 
 queues:
diff --git a/defaults/overlays/language_count.yml b/defaults/overlays/language_count.yml
index ff83ff11..8d1dbc50 100644
--- a/defaults/overlays/language_count.yml
+++ b/defaults/overlays/language_count.yml
@@ -34,11 +34,17 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: <<key>>_<<image_key>>
     group: language
     back_color: "#00000099"
     back_width: 188
     back_height: 105
-    pmm: <<key>>_<<image_key>>
 
 templates:
   language:
diff --git a/defaults/overlays/languages.yml b/defaults/overlays/languages.yml
index 886e4659..4fee4895 100644
--- a/defaults/overlays/languages.yml
+++ b/defaults/overlays/languages.yml
@@ -32,13 +32,19 @@ external_templates:
             value: 26
           - style: square
             value:
+      pmm_<<key>>:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: flag/<<final_style>>/<<country_<<key>>>>
     default:
       style: round
       country: <<key>>
       country_<<key>>: <<country>>
       offset: 10
     queue: flags
-    pmm_<<key>>: flag/<<final_style>>/<<country_<<key>>>>
     addon_position: <<final_align>>
     addon_offset: <<offset>>
     back_color: "#00000099"
diff --git a/defaults/overlays/mediastinger.yml b/defaults/overlays/mediastinger.yml
index 4e9b2548..61402de3 100644
--- a/defaults/overlays/mediastinger.yml
+++ b/defaults/overlays/mediastinger.yml
@@ -30,11 +30,17 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: <<overlay_name>>
     allowed_libraries: movie
     back_color: "#00000099"
     back_width: 105
     back_height: 105
-    pmm: <<overlay_name>>
 
 overlays:
   Mediastinger:
diff --git a/defaults/overlays/ratings.yml b/defaults/overlays/ratings.yml
index 0f3e8f4a..1de095a2 100644
--- a/defaults/overlays/ratings.yml
+++ b/defaults/overlays/ratings.yml
@@ -424,6 +424,17 @@ templates:
           - rating<<rating_num>>: [critic, audience, user]
             image_level: Rotten
             value: lt
+      rating<<rating_num>>_pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            rating<<rating_num>>_file.exists: false
+            rating<<rating_num>>_url.exists: false
+            rating<<rating_num>>_git.exists: false
+            rating<<rating_num>>_repo.exists: false
+            value: rating/<<rating<<rating_num>>_image_url>><<image_extra>>
     plex_search:
       all:
         <<rating<<rating_num>>>>_rating.<<gsuffix>>: <<gte>>
diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml
index 451a7e20..343757b9 100644
--- a/defaults/overlays/resolution.yml
+++ b/defaults/overlays/resolution.yml
@@ -93,8 +93,16 @@ external_templates:
       pmm:
         conditions:
           - type: [edition, edition_dovetail]
+            file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
             value: edition/<<key>>
           - type: [resolution, resolution_dovetail]
+            file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
             value: resolution/<<key>><<alt>>
       group:
         conditions:
diff --git a/defaults/overlays/ribbon.yml b/defaults/overlays/ribbon.yml
index 116852e7..1adc71f8 100644
--- a/defaults/overlays/ribbon.yml
+++ b/defaults/overlays/ribbon.yml
@@ -8,8 +8,15 @@
 external_templates:
   pmm: templates
   template_variables:
+    conditionals:
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: ribbon/<<key>>
     group: ribbon
-    pmm: ribbon/<<key>>
     horizontal_offset: 0
     horizontal_align: right
     vertical_offset: 0
diff --git a/defaults/overlays/streaming.yml b/defaults/overlays/streaming.yml
index 8348c0b1..d0584f59 100644
--- a/defaults/overlays/streaming.yml
+++ b/defaults/overlays/streaming.yml
@@ -36,10 +36,16 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: streaming/<<overlay_name>>
     back_color: "#00000099"
     back_width: 305
     back_height: 105
-    pmm: streaming/<<overlay_name>>
 
 templates:
   mdb_streaming:
diff --git a/defaults/overlays/versions.yml b/defaults/overlays/versions.yml
index f8d58472..4a84f25d 100644
--- a/defaults/overlays/versions.yml
+++ b/defaults/overlays/versions.yml
@@ -39,10 +39,16 @@ external_templates:
             value: 0
           - horizontal_align: [left, right]
             value: 15
+      pmm:
+        conditions:
+          - file.exists: false
+            url.exists: false
+            git.exists: false
+            repo.exists: false
+            value: <<overlay_name>>
     back_color: "#00000099"
     back_width: 105
     back_height: 105
-    pmm: <<overlay_name>>
 
 templates:
   versions:
diff --git a/docs/defaults/overlay_variables.md b/docs/defaults/overlay_variables.md
index 4f7f8768..308f7ef8 100644
--- a/docs/defaults/overlay_variables.md
+++ b/docs/defaults/overlay_variables.md
@@ -9,11 +9,10 @@ Below are the available variables which can be used to customize the file.
 | Variable                  | Description & Values                                                                                                                                                                                           |
 |:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `use_<<key>>`<sup>1</sup> | **Description:** Turns off individual Overlays in a Defaults file.<br>**Values:** `false` to turn off the overlay                                                                                              |
-| `file`                    | **Description:** Controls the image associated with the Overlay to a local file. Use `pmm: null` with this to not use the default image.<br>**Values:** Filepath to Overlay Image                              |
-| `url`                     | **Description:** Controls the image associated with the Overlay to a url. Use `pmm: null` with this to not use the default image.<br>**Values:** URL to Overlay Image                                          |
-| `git`                     | **Description:** Controls the image associated with the Overlay to the git repo. Use `pmm: null` with this to not use the default image.<br>**Values:** Git Path to Overlay Image                              |
-| `repo`                    | **Description:** Controls the image associated with the Overlay to a custom repo. Use `pmm: null` with this to not use the default image.<br>**Values:** Repo Path to Overlay Image                            |
-| `pmm`                     | **Description:** Controls the image associated with the Overlay to a pmm file.<br>**Values:** PMM Overlay Image                                                                                                |
+| `file`                    | **Description:** Controls the image associated with the Overlay to a local file.<br>**Values:** Filepath to Overlay Image                                                                                      |
+| `url`                     | **Description:** Controls the image associated with the Overlay to a url.<br>**Values:** URL to Overlay Image                                                                                                  |
+| `git`                     | **Description:** Controls the image associated with the Overlay to the git repo.<br>**Values:** Git Path to Overlay Image                                                                                      |
+| `repo`                    | **Description:** Controls the image associated with the Overlay to a custom repo.<br>**Values:** Repo Path to Overlay Image                                                                                    |
 | `horizontal_offset`       | **Description:** Controls the Horizontal Offset of this overlay. Can be a %.<br>**Values:** Number 0 or greater or 0%-100%                                                                                     |
 | `horizontal_align`        | **Description:** Controls the Horizontal Alignment of the overlay.<br>**Values:** `left`, `center`, or `right`                                                                                                 |
 | `vertical_offset`         | **Description:** Controls the Vertical Offset of this overlay. Can be a %.<br>**Values:** Number 0 or greater or 0%-100%                                                                                       |