update defaults to be in line with others and separated streaming

PMM/movie/streaming.yml

@@ -1,159 +0,0 @@
-#############################################################
-#               Streaming Service Collections               #
-#         Created by Yozora, Bullmoose20, & Sohjiro         #
-#############################################################
-#  Call this from your config.yml (Movie only)              #
-#  If nothing is specified these are the defaults           #
-#                                                           #
-#    metadata_path:                                         #
-#      - git: PMM/movie/streaming                           #
-#        template_variables:                                #
-#          # Turn the separator collection on/off           #
-#          use_separator: true                              #
-#          # Sets how the collection is sorted              #
-#          sort_by: release.desc                            #
-#          # Sets the collection mode of the collection     #
-#          collection_mode:                                 #
-#          # Sets the value at the start of the sort title  #
-#          collection_section: "03"                         #
-#                                                           #
-#          # Turn the All 4 collection on/off               #
-#          use_all4: true                                   #
-#          # Set visible_library for All 4                  #
-#          visible_library_all4: true                       #
-#          # Set visible_home for All 4                     #
-#          visible_home_all4: true                          #
-#          # Set visible_shared for All 4                   #
-#          visible_shared_all4: true                        #
-#                                                           #
-#          # Turn the Apple TV+ collection on/off           #
-#          use_appletv: true                                #
-#          # Set visible_library for Apple TV+              #
-#          visible_library_appletv: true                    #
-#          # Set visible_home for Apple TV+                 #
-#          visible_home_appletv: true                       #
-#          # Set visible_shared for Apple TV+               #
-#          visible_shared_appletv: true                     #
-#                                                           #
-#          # Turn the BET+ collection on/off                #
-#          use_bet: true                                    #
-#          # Set visible_library for BET+                   #
-#          visible_library_bet: true                        #
-#          # Set visible_home for BET+                      #
-#          visible_home_bet: true                           #
-#          # Set visible_shared for BET+                    #
-#          visible_shared_bet: true                         #
-#                                                           #
-#          # Turn the BritBox collection on/off             #
-#          use_britbox: true                                #
-#          # Set visible_library for BritBox                #
-#          visible_library_britbox: true                    #
-#          # Set visible_home for BritBox                   #
-#          visible_home_britbox: true                       #
-#          # Set visible_shared for BritBox                 #
-#          visible_shared_britbox: true                     #
-#                                                           #
-#          # Turn the Disney+ collection on/off             #
-#          use_disney: true                                 #
-#          # Set visible_library for Disney+                #
-#          visible_library_disney: true                     #
-#          # Set visible_home for Disney+                   #
-#          visible_home_disney: true                        #
-#          # Set visible_shared for Disney+                 #
-#          visible_shared_disney: true                      #
-#                                                           #
-#          # Turn the HBO Max collection on/off             #
-#          use_hbomax: true                                 #
-#          # Set visible_library for HBO Max                #
-#          visible_library_hbomax: true                     #
-#          # Set visible_home for HBO Max                   #
-#          visible_home_hbomax: true                        #
-#          # Set visible_shared for HBO Max                 #
-#          visible_shared_hbomax: true                      #
-#                                                           #
-#          # Turn the Hulu collection on/off                #
-#          use_hulu: true                                   #
-#          # Set visible_library for Hulu                   #
-#          visible_library_hulu: true                       #
-#          # Set visible_home for Hulu                      #
-#          visible_home_hulu: true                          #
-#          # Set visible_shared for Hulu                    #
-#          visible_shared_hulu: true                        #
-#                                                           #
-#          # Turn the Netflix collection on/off             #
-#          use_netflix: true                                #
-#          # Set visible_library for Netflix                #
-#          visible_library_netflix: true                    #
-#          # Set visible_home for Netflix                   #
-#          visible_home_netflix: true                       #
-#          # Set visible_shared for Netflix                 #
-#          visible_shared_netflix: true                     #
-#                                                           #
-#          # Turn the NOW collection on/off                 #
-#          use_now: true                                    #
-#          # Set visible_library for NOW                    #
-#          visible_library_now: true                        #
-#          # Set visible_home for NOW                       #
-#          visible_home_now: true                           #
-#          # Set visible_shared for NOW                     #
-#          visible_shared_now: true                         #
-#                                                           #
-#          # Turn the Paramount+ collection on/off          #
-#          use_paramount: true                              #
-#          # Set visible_library for Paramount+             #
-#          visible_library_paramount: true                  #
-#          # Set visible_home for Paramount+                #
-#          visible_home_paramount: true                     #
-#          # Set visible_shared for Paramount+              #
-#          visible_shared_paramount: true                   #
-#                                                           #
-#          # Turn the Peacock collection on/off             #
-#          use_peacock: true                                #
-#          # Set visible_library for Peacock                #
-#          visible_library_peacock: true                    #
-#          # Set visible_home for Peacock                   #
-#          visible_home_peacock: true                       #
-#          # Set visible_shared for Peacock                 #
-#          visible_shared_peacock: true                     #
-#                                                           #
-#          # Turn the Prime Video collection on/off         #
-#          use_amazon: true                                 #
-#          # Set visible_library for Prime Video            #
-#          visible_library_amazon: true                     #
-#          # Set visible_home for Prime Video               #
-#          visible_home_amazon: true                        #
-#          # Set visible_shared for Prime Video             #
-#          visible_shared_amazon: true                      #
-#############################################################
-
-external_templates:
-  git: PMM/templates
-  template_variables:
-    collection_section: "03"
-
-collections:
-  Streaming Collections:
-    template:
-      - name: separator
-        separator: streaming
-
-dynamic_collections:
-  Streaming:
-    type: custom
-    data:
-      all4: All 4
-      appletv: Apple TV+
-      bet: BET+
-      britbox: BritBox
-      disney: Disney+
-      hbomax: HBO Max
-      hulu: Hulu
-      netflix: Netflix
-      now: NOW
-      paramount: Paramount+
-      peacock: Peacock
-      amazon: Prime Video
-    title_format: <<key_name>> Movies
-    template:
-      - streaming
-      - shared

PMM/overlays/audio_codec.yml

@@ -24,23 +24,23 @@
 #          vertical_align: top                              #
 #                                                           #
 #          # Use the Opus overlay                           #
-#          Opus: true                                       #
+#          use_opus: true                                   #
 #          # Use the Dolby-Digital overlay                  #
-#          Dolby-Digital: true                              #
+#          use_digital: true                                #
 #          # Use the DTS overlay                            #
-#          DTS: true                                        #
+#          use_dts: true                                    #
 #          # Use the DTS-ES overlay                         #
-#          DTS-ES: true                                     #
+#          use_es: true                                     #
 #          # Use the DTS-HD overlay                         #
-#          DTS-HD: true                                     #
+#          use_hd: true                                     #
 #          # Use the Dolby-TrueHD overlay                   #
-#          Dolby-TrueHD: true                               #
+#          use_truehd: true                                 #
 #          # Use the Dolby-Digital-Plus overlay             #
-#          Dolby-Digital-Plus: true                         #
+#          use_plus: true                                   #
 #          # Use the Dolby-Atmos overlay                    #
-#          Dolby-Atmos: true                                #
+#          use_atmos: true                                  #
 #          # Use the DTS-X overlay                          #
-#          DTS-X: true                                      #
+#          use_x: true                                      #
 #############################################################
 
 templates:
@@ -54,6 +54,7 @@ templates:
       vertical_offset: 15
       vertical_align: top
     collection_level: <<overlay_level>>
+    allowed_library_types: <<use_<<slug>>>>
     overlay:
       name: <<overlay_name>>
       git: PMM/overlays/images/<<overlay>>
@@ -64,58 +65,13 @@ templates:
       vertical_offset: <<vertical_offset>>
       vertical_align: <<vertical_align>>
 
-  Opus:
-    default:
-      Opus: true
-    allowed_library_types: <<Opus>>
-
-  Dolby-Digital:
-    default:
-      Dolby-Digital: true
-    allowed_library_types: <<Dolby-Digital>>
-
-  DTS:
-    default:
-      DTS: true
-    allowed_library_types: <<DTS>>
-
-  DTS-ES:
-    default:
-      DTS-ES: true
-    allowed_library_types: <<DTS-ES>>
-
-  DTS-HD:
-    default:
-      DTS-HD: true
-    allowed_library_types: <<DTS-HD>>
-
-  Dolby-TrueHD:
-    default:
-      Dolby-TrueHD: true
-    allowed_library_types: <<Dolby-TrueHD>>
-
-  Dolby-Digital-Plus:
-    default:
-      Dolby-Digital-Plus: true
-    allowed_library_types: <<Dolby-Digital-Plus>>
-
-  Dolby-Atmos:
-    default:
-      Dolby-Atmos: true
-    allowed_library_types: <<Dolby-Atmos>>
-
-  DTS-X:
-    default:
-      DTS-X: true
-    allowed_library_types: <<DTS-X>>
-
 overlays:
 
   Opus:
     template:
       - name: AudioCodec
         weight: 5
-      - name: Opus
+        slug: opus
     plex_all: true
     filters:
       audio_track_title.regex: '(?i)\bOPUS(\b|\d)'
@@ -125,7 +81,7 @@ overlays:
       - name: AudioCodec
         overlay: Opus
         weight: 5
-      - name: Opus
+        slug: Opus
     plex_all: true
     filters:
       filepath.regex: '(?i)\bOPUS(\b|\d)'
@@ -134,7 +90,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 10
-      - name: Dolby-Digital
+        slug: digital
     plex_all: true
     filters:
       audio_track_title.regex:
@@ -146,7 +102,7 @@ overlays:
       - name: AudioCodec
         overlay: Dolby-Digital
         weight: 10
-      - name: Dolby-Digital
+        slug: digital
     plex_all: true
     filters:
       filepath.regex:
@@ -157,7 +113,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 20
-      - name: DTS
+        slug: dts
     plex_all: true
     filters:
       audio_track_title.regex: '(?i)\bDTS(\b|\d)'
@@ -167,7 +123,7 @@ overlays:
       - name: AudioCodec
         overlay: DTS
         weight: 20
-      - name: DTS
+        slug: dts
     plex_all: true
     filters:
       filepath.regex: '(?i)\bDTS(\b|\d)'
@@ -176,7 +132,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 30
-      - name: DTS-ES
+        slug: es
     plex_all: true
     filters:
       audio_track_title.regex: '(?i)dts[ ._-]?(es|(hd[. ]?)?(hr|hi))'
@@ -186,7 +142,7 @@ overlays:
       - name: AudioCodec
         overlay: DTS-ES
         weight: 30
-      - name: DTS-ES
+        slug: es
     plex_all: true
     filters:
       filepath.regex: '(?i)dts[ ._-]?(es|(hd[. ]?)?(hr|hi))'
@@ -195,7 +151,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 40
-      - name: DTS-HD
+        slug: hd
     plex_all: true
     filters:
       audio_track_title.regex:
@@ -207,7 +163,7 @@ overlays:
       - name: AudioCodec
         overlay: DTS-HD
         weight: 40
-      - name: DTS-HD
+        slug: hd
     plex_all: true
     filters:
       filepath.regex:
@@ -218,7 +174,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 50
-      - name: Dolby-TrueHD
+        slug: truehd
     plex_all: true
     filters:
       audio_track_title.regex: '(?i)true[ .-]?hd'
@@ -228,7 +184,7 @@ overlays:
       - name: AudioCodec
         overlay: Dolby-TrueHD
         weight: 50
-      - name: Dolby-TrueHD
+        slug: truehd
     plex_all: true
     filters:
       filepath.regex: '(?i)true[ .-]?hd'
@@ -237,7 +193,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 60
-      - name: Dolby-Digital-Plus
+        slug: plus
     plex_all: true
     filters:
       audio_track_title.regex:
@@ -249,7 +205,7 @@ overlays:
       - name: AudioCodec
         overlay: Dolby-Digital-Plus
         weight: 60
-      - name: Dolby-Digital-Plus
+        slug: plus
     plex_all: true
     filters:
       filepath.regex:
@@ -260,7 +216,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 70
-      - name: Dolby-Atmos
+        slug: atmos
     plex_all: true
     filters:
       audio_track_title.regex: '(?i)atmos'
@@ -270,7 +226,7 @@ overlays:
       - name: AudioCodec
         overlay: Dolby-Atmos
         weight: 70
-      - name: Dolby-Atmos
+        slug: atmos
     plex_all: true
     filters:
       filepath.regex: '(?i)atmos'
@@ -279,7 +235,7 @@ overlays:
     template:
       - name: AudioCodec
         weight: 80
-      - name: DTS-X
+        slug: x
     plex_all: true
     filters:
       audio_track_title.regex: '(?i)dts[ ._:-]?x(?!\\d)'
@@ -289,7 +245,7 @@ overlays:
       - name: AudioCodec
         overlay: DTS-X
         weight: 80
-      - name: DTS-X
+        slug: x
     plex_all: true
     filters:
       filepath.regex: '(?i)dts[ ._:-]?x(?!\\d)'

PMM/overlays/resolution.yml

@@ -126,6 +126,16 @@ templates:
       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>>
+
 overlays:
 
   4K-DV:
@@ -247,3 +257,21 @@ overlays:
     plex_search:
       any:
         resolution.regex: '(?i)480|sd'
+
+  DV:
+    template:
+      - name: DV
+      - name: Resolution
+        weight: 5
+    plex_all: true
+    filters:
+      has_dolby_vision: true
+
+  HDR:
+    template:
+      - name: HDR
+      - name: Resolution
+        weight: 0
+    plex_search:
+      all:
+        hdr: true

PMM/overlays/special_release.yml

@@ -22,6 +22,13 @@
 #          vertical_offset: 113                             #
 #          # Set the vertical align for the overlay         #
 #          vertical_align: bottom                           #
+#                                                           #
+#          # Use the Criterion overlay                      #
+#          use_criterion: true                              #
+#          # Use the IMAX-E overlay                         #
+#          use_enhanced: true                               #
+#          # Use the IMAX overlay                           #
+#          use_imax: true                                   #
 #############################################################
 
 templates:
@@ -35,6 +42,7 @@ templates:
       vertical_offset: 113
       vertical_align: bottom
     collection_level: <<overlay_level>>
+    allowed_library_types: <<use_<<slug>>>>
     overlay:
       name: <<overlay_name>>
       git: PMM/overlays/images/<<overlay>>
@@ -45,28 +53,13 @@ templates:
       vertical_offset: <<vertical_offset>>
       vertical_align: <<vertical_align>>
 
-  Criterion:
-    default:
-      Criterion: true
-    allowed_library_types: <<Criterion>>
-
-  IMAX-E:
-    default:
-      IMAX-E: true
-    allowed_library_types: <<IMAX-E>>
-
-  IMAX:
-    default:
-      IMAX: true
-    allowed_library_types: <<IMAX>>
-
 overlays:
 
   Criterion:
     template:
       - name: SpecialRelease
         weight: 30
-      - name: Criterion
+        slug: criterion
     plex_all: true
     filters:
       filepath.regex:
@@ -77,7 +70,7 @@ overlays:
     template:
       - name: SpecialRelease
         weight: 20
-      - name: IMAX-E
+        slug: enhanced
     plex_all: true
     filters:
       filepath.regex: '(?i)\bIMAX Enhanced\b'
@@ -86,7 +79,7 @@ overlays:
     template:
       - name: SpecialRelease
         weight: 10
-      - name: IMAX
+        slug: imax
     plex_all: true
     filters:
       filepath.regex: '(?i)\bIMAX\b'

PMM/overlays/streaming.yml

@@ -52,8 +52,8 @@ templates:
       horizontal_align: left
       vertical_offset: 135
       vertical_align: top
-    allowed_library_types: <<use_<<slug>>>>
     collection_level: <<overlay_level>>
+    allowed_library_types: <<use_<<slug>>>>
     overlay:
       name: <<overlay_name>>
       git: PMM/overlays/images/<<overlay>>
@@ -63,9 +63,7 @@ templates:
       horizontal_align: <<horizontal_align>>
       vertical_offset: <<vertical_offset>>
       vertical_align: <<vertical_align>>
-    plex_all: true
+    mdblist_list: https://mdblist.com/lists/plexmetamanager/<<slug>>-<<library_type>>s
-    filters:
-      filepath.regex: <<regex>>
 
 overlays:
 
@@ -74,53 +72,45 @@ overlays:
       - name: Streaming
         weight: 200
         slug: amazon
-        regex: '(?i)\b(amzn|amazon)\b'
 
   AppleTV:
     template:
       - name: Streaming
         weight: 200
         slug: appletv
-        regex: '(?i)\b(atvp|aptv|Apple TV\+)\b'
 
   Disney:
     template:
       - name: Streaming
         weight: 200
         slug: disney
-        regex: '(?i)\b(dsnp|dsny|disney|Disney\+)\b'
 
   HBO-Max:
     template:
       - name: Streaming
         weight: 200
         slug: hbomax
-        regex: '(?i)\b(hmax|hbom|HBO Max)\b'
 
   Hulu:
     template:
       - name: Streaming
         weight: 200
         slug: hulu
-        regex: '(?i)\b(hulu)\b'
 
   Netflix:
     template:
       - name: Streaming
         weight: 200
         slug: netflix
-        regex: '(?i)\b(nf|netflix)\b'
 
   Paramount:
     template:
       - name: Streaming
         weight: 200
         slug: paramount
-        regex: '(?i)\b(pmtp|Paramount Plus)\b'
 
   Peacock:
     template:
       - name: Streaming
         weight: 200
         slug: peacock
-        regex: '(?i)\b(pcok|peacock)\b'

PMM/overlays/video_format.yml

@@ -24,21 +24,22 @@
 #          vertical_align: bottom                           #
 #                                                           #
 #          # Use the Remux overlay                          #
-#          Remux: true                                      #
+#          use_remux: true                                  #
 #          # Use the Blu-Ray overlay                        #
-#          Blu-Ray: true                                    #
+#          use_bluray: true                                 #
 #          # Use the WEB overlay                            #
-#          WEB: true                                        #
+#          use_web: true                                    #
 #          # Use the HDTV overlay                           #
-#          HDTV: true                                       #
+#          use_hdtv: true                                   #
 #          # Use the DVD overlay                            #
-#          DVD: true                                        #
+#          use_dvd: true                                    #
 #############################################################
 
 templates:
   VideoFormat:
     optional:
       - overlay_level
+      - <<use_<<slug>>>>
     default:
       overlay: <<overlay_name>>
       horizontal_offset: 15
@@ -46,6 +47,7 @@ templates:
       vertical_offset: 15
       vertical_align: bottom
     collection_level: <<overlay_level>>
+    allowed_library_types: <<use_<<slug>>>>
     overlay:
       name: text(<<overlay_name>>)
       group: quality
@@ -62,38 +64,13 @@ templates:
       back_width: 265
       back_height: 85
 
-  Remux:
-    default:
-      Remux: true
-    allowed_library_types: <<Remux>>
-
-  Blu-Ray:
-    default:
-      Blu-Ray: true
-    allowed_library_types: <<Blu-Ray>>
-
-  WEB:
-    default:
-      WEB: true
-    allowed_library_types: <<WEB>>
-
-  HDTV:
-    default:
-      HDTV: true
-    allowed_library_types: <<HDTV>>
-
-  DVD:
-    default:
-      DVD: true
-    allowed_library_types: <<DVD>>
-
 overlays:
 
   Remux:
     template:
       - name: VideoFormat
         weight: 50
-      - name: Remux
+        slug: remux
     plex_all: true
     filters:
       filepath.regex: '(?i)\[Remux'
@@ -102,7 +79,7 @@ overlays:
     template:
       - name: VideoFormat
         weight: 40
-      - name: Blu-Ray
+        slug: bluray
     plex_all: true
     filters:
       filepath.regex: '(?i)\[Blu[ ._-]?ray|\[BD|\[BR|\[HD[ ._-]?DVD'
@@ -111,7 +88,7 @@ overlays:
     template:
       - name: VideoFormat
         weight: 30
-      - name: WEB
+        slug: web
     plex_all: true
     filters:
       filepath.regex: '(?i)Web[ ._-]?(dl|rip)'
@@ -120,7 +97,7 @@ overlays:
     template:
       - name: VideoFormat
         weight: 20
-      - name: HDTV
+        slug: hdtv
     plex_all: true
     filters:
       filepath.regex: '(?i)HD[ ._-]?TV'
@@ -129,7 +106,7 @@ overlays:
     template:
       - name: VideoFormat
         weight: 10
-      - name: DVD
+        slug: dvd
     plex_all: true
     filters:
       filepath.regex: '(?i)\[DVD'

PMM/streaming.yml

@@ -2,11 +2,11 @@
 #               Streaming Service Collections               #
 #         Created by Yozora, Bullmoose20, & Sohjiro         #
 #############################################################
-#  Call this from your config.yml (Show only)               #
+#  Call this from your config.yml (Movie or Show)           #
 #  If nothing is specified these are the defaults           #
 #                                                           #
 #    metadata_path:                                         #
-#      - git: PMM/show/streaming                            #
+#      - git: PMM/streaming                                 #
 #        template_variables:                                #
 #          # Turn the separator collection on/off           #
 #          use_separator: true                              #
@@ -140,6 +140,29 @@ external_templates:
   template_variables:
     collection_section: "03"
 
+templates:
+  streaming:
+    default:
+      sort_by: release.desc
+      key: <<collection_name>>
+    optional:
+      - use
+      - use_<<key>>
+      - visible_library_<<key>>
+      - visible_home_<<key>>
+      - visible_shared_<<key>>
+    allowed_library_types:
+      - <<use_<<key>>>>
+      - <<use>>
+    visible_library: <<visible_library_<<key>>>>
+    visible_home: <<visible_home_<<key>>>>
+    visible_shared: <<visible_shared_<<key>>>>
+    cache_builders: 1
+    smart_label: <<sort_by>>
+    sync_mode: sync
+    mdblist_list: https://mdblist.com/lists/plexmetamanager/<<key>>-<<library_type>>s
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/streaming/<<key_name_encoded>>.jpg
+
 collections:
   Streaming Collections:
     template:
@@ -163,7 +186,10 @@ dynamic_collections:
       paramount: Paramount+
       peacock: Peacock
       amazon: Prime Video
-    title_format: <<key_name>> Shows
+    title_format: <<key_name>> <<library_type>>s
+    template_variables:
+      use:
+        hayu: show
     template:
       - streaming
       - shared

PMM/templates.yml

@@ -113,25 +113,6 @@ templates:
     libraries: <<libraries>>
     url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/playlist/<<playlist_name_encoded>>.jpg
 
-  streaming:
-    default:
-      sort_by: release.desc
-      key: <<collection_name>>
-    optional:
-      - use_<<key>>
-      - visible_library_<<key>>
-      - visible_home_<<key>>
-      - visible_shared_<<key>>
-    allowed_library_types: <<use_<<key>>>>
-    visible_library: <<visible_library_<<key>>>>
-    visible_home: <<visible_home_<<key>>>>
-    visible_shared: <<visible_shared_<<key>>>>
-    cache_builders: 1
-    smart_label: <<sort_by>>
-    sync_mode: sync
-    mdblist_list: https://mdblist.com/lists/plexmetamanager/<<key>>-<<library_type>>s
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/streaming/<<key_name_encoded>>.jpg
-
   use_year_collections:
     optional:
       - use_year_collections