Merge remote-tracking branch 'meisnate12/master'

PMM/award/bafta.yml

@@ -49,7 +49,7 @@ collections:
     template:
       - name: shared
         sort: BAFTA !
-        library_type: movie
+        allowed_libraries: movie
         image: award/bafta/winner
       - name: arr
       - name: custom

PMM/award/cannes.yml

@@ -49,7 +49,7 @@ collections:
     template:
       - name: shared
         sort: Cannes !
-        library_type: movie
+        allowed_libraries: movie
         image: award/cannes/winner
       - name: arr
       - name: custom

PMM/award/oscars.yml

@@ -49,7 +49,7 @@ collections:
     template:
       - name: shared
         sort: Oscars !1
-        library_type: movie
+        allowed_libraries: movie
         image: award/oscars/best_picture_winner
       - name: arr
       - name: custom
@@ -62,7 +62,7 @@ collections:
     template:
       - name: shared
         sort: Oscars !2
-        library_type: movie
+        allowed_libraries: movie
         image: award/oscars/best_director_winner
       - name: arr
       - name: custom

PMM/award/other.yml

@@ -39,7 +39,7 @@ collections:
       key: cesar
     template:
       - name: shared
-        library_type: movie
+        allowed_libraries: movie
         image: award/cesar/winner
       - name: arr
       - name: custom
@@ -50,7 +50,7 @@ collections:
       key: berlinale
     template:
       - name: shared
-        library_type: movie
+        allowed_libraries: movie
         image: award/berlinale/winner
       - name: arr
       - name: custom
@@ -61,7 +61,7 @@ collections:
       key: venice
     template:
       - name: shared
-        library_type: movie
+        allowed_libraries: movie
         image: award/venice/winner
       - name: arr
       - name: custom

PMM/award/sundance.yml

@@ -48,7 +48,7 @@ collections:
     template:
       - name: shared
         sort: Sundance !1
-        library_type: movie
+        allowed_libraries: movie
         image: award/sundance/grand_jury_winner
       - name: arr
       - name: custom

PMM/chart/basic.yml

@@ -87,4 +87,4 @@ collections:
     template:
       - name: episodes
       - name: shared
-        library_type: show
+        allowed_libraries: show

PMM/chart/imdb.yml

@@ -92,6 +92,6 @@ collections:
     imdb_chart: lowest_rated
     template:
       - name: shared
-        library_type: movie
+        allowed_libraries: movie
       - name: arr
       - name: custom

PMM/chart/other.yml

@@ -97,7 +97,7 @@ collections:
     stevenlu_popular: true
     template:
       - name: shared
-        library_type: movie
+        allowed_libraries: movie
       - name: arr
       - name: custom
 
@@ -108,6 +108,6 @@ collections:
     summary: TorrentFreak.com's Weekly Top Ten Pirated Movies
     template:
       - name: shared
-        library_type: movie
+        allowed_libraries: movie
       - name: arr
       - name: custom

PMM/chart/tmdb.yml

@@ -103,7 +103,7 @@ collections:
     template:
       - name: airing
       - name: shared
-        library_type: show
+        allowed_libraries: show
       - name: arr
       - name: custom
 
@@ -113,7 +113,7 @@ collections:
     template:
       - name: air
       - name: shared
-        library_type: show
+        allowed_libraries: show
       - name: arr
       - name: custom
 

PMM/movie/franchise.yml

@@ -38,6 +38,9 @@ templates:
       - name_mapping
       - sort_title
       - build_collection
+      - radarr_folder
+      - radarr_tag
+      - item_radarr_tag
     cache_builders: 1
     minimum_items: <<minimum_items>>
     tmdb_collection_details: <<value>>

PMM/movie/seasonal.yml

@@ -79,45 +79,11 @@ templates:
       key: <<collection_name>>
       sort_by: title.asc
       sort_by_<<key>>: <<sort_by>>
-      visible_home_<<key>>: true
-      visible_shared_<<key>>: true
-      radarr_add_missing_<<key>>: <<radarr_add_missing>>
-      sonarr_add_missing_<<key>>: <<sonarr_add_missing>>
-      radarr_folder_<<key>>: <<radarr_folder>>
-      sonarr_folder_<<key>>: <<sonarr_folder>>
-      radarr_tag_<<key>>: <<radarr_tag>>
-      sonarr_tag_<<key>>: <<sonarr_tag>>
-      item_radarr_tag_<<key>>: <<item_radarr_tag>>
-      item_sonarr_tag_<<key>>: <<item_sonarr_tag>>
     optional:
-      - use_<<key>>
       - schedule_<<key>>
-      - visible_library_<<key>>
-      - radarr_add_missing
-      - sonarr_add_missing
-      - radarr_folder
-      - sonarr_folder
-      - radarr_tag
-      - sonarr_tag
-      - item_radarr_tag
-      - item_sonarr_tag
-    allowed_library_types:
-      - <<use_<<key>>>>
     schedule: <<schedule_<<key>>>>
-    visible_library: <<visible_library_<<key>>>>
-    visible_home: <<visible_home_<<key>>>>
-    visible_shared: <<visible_shared_<<key>>>>
-    radarr_add_missing: <<radarr_add_missing_<<key>>>>
-    sonarr_add_missing: <<sonarr_add_missing_<<key>>>>
-    radarr_folder: <<radarr_folder_<<key>>>>
-    sonarr_folder: <<sonarr_folder_<<key>>>>
-    radarr_tag: <<radarr_tag_<<key>>>>
-    sonarr_tag: <<sonarr_tag_<<key>>>>
-    item_radarr_tag: <<item_radarr_tag_<<key>>>>
-    item_sonarr_tag: <<item_sonarr_tag_<<key>>>>
     smart_label: <<sort_by_<<key>>>>
     summary: A collection of <<collection_name>> and other movies that may relate to the season.
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/seasonal/<<key>>.jpg
     delete_not_scheduled: true
 
 collections:
@@ -127,54 +93,90 @@ collections:
         separator: seasonal
 
   Independence Day:
+    variables:
+      key: independence
     template:
       - name: Holiday
-        key: independence
         schedule_independence: range(06/23-07/11)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list: 
       - https://www.imdb.com/list/ls068664510/
       - https://www.imdb.com/list/ls080925875/
 
   Easter:
+    variables:
+      key: easter
     template:
       - name: Holiday
-        key: easter
         schedule_easter: range(03/15-04/30)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list: 
       - https://www.imdb.com/list/ls062665509/
       - https://www.imdb.com/list/ls051733651/
 
   Valentine's Day:
+    variables:
+      key: valentine
     template:
       - name: Holiday
-        key: valentine
         schedule_valentine: range(02/01-02/29)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list:
       - https://www.imdb.com/list/ls000094398/
       - https://www.imdb.com/list/ls057783436/
       - https://www.imdb.com/list/ls064427905/
 
   St. Patrick's Day:
+    variables:
+      key: patrick
     template:
       - name: Holiday
-        key: patrick
         schedule_patrick: range(03/01-03/18)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list: https://www.imdb.com/list/ls063934595/
 
   Thanksgiving:
+    variables:
+      key: thanksgiving
     template:
       - name: Holiday
-        key: thanksgiving
         schedule_thanksgiving: range(11/01-11/30)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list: 
       - https://www.imdb.com/list/ls000835734/
       - https://www.imdb.com/list/ls091597850/
 
   Halloween:
+    variables:
+      key: halloween
     template:
       - name: Holiday
-        key: halloween
         schedule_halloween: range(10/01-10/31)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list:
       - https://www.imdb.com/list/ls023118929/
       - https://www.imdb.com/list/ls000099714/
@@ -187,15 +189,27 @@ collections:
       - 23437    # A Nightmare on Elm Street (2010)
 
   Christmas:
+    variables:
+      key: christmas
     template:
       - name: Holiday
-        key: christmas
         schedule_christmas: range(12/01-12/31)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list: https://www.imdb.com/list/ls000096828/
 
   New Year's Day:
+    variables:
+      key: years
     template:
       - name: Holiday
-        key: years
         schedule_years: range(12/26-01/04)
+      - name: shared
+        visible_home_<<key>>: true
+        visible_shared_<<key>>: true
+        image: seasonal/<<key>>
+      - name: arr
     imdb_list: https://www.imdb.com/list/ls066838460/

PMM/movie/universe.yml

@@ -52,6 +52,7 @@ collections:
       - name: multi-franchise
         image: Star Wars
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/zorge88/lists/star-wars
   DC Animated Universe:
@@ -61,6 +62,7 @@ collections:
       - name: multi-franchise
         image: DC Universe
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/dc-animated-movie-universe
   DC Extended Universe:
@@ -70,6 +72,7 @@ collections:
       - name: multi-franchise
         image: DC Universe
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/dc-extended-universe
     summary: The DC Extended Universe (DCEU) is the fictional shared universe where most stories in American comic book titles published by DC Comics take place. DC superheroes such as Superman, Batman, Wonder Woman, Martian Manhunter, The Flash, Green Lantern and Aquaman are from this universe, as well as teams such as the Justice League and the Teen Titans.
@@ -80,6 +83,7 @@ collections:
       - name: multi-franchise
         image: Marvel Cinematic Universe
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe
   Wizarding World:
@@ -89,6 +93,7 @@ collections:
       - name: multi-franchise
         image: Wizarding World
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/strangerer/lists/harry-potter
   "Alien / Predator":
@@ -98,6 +103,7 @@ collections:
       - name: multi-franchise
         image: Alien Predator
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/alien-predator-timeline
     name_mapping: Alien Predator
@@ -108,6 +114,7 @@ collections:
       - name: multi-franchise
         image: X-Men
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/x-men-universe
   Middle Earth:
@@ -117,6 +124,7 @@ collections:
       - name: multi-franchise
         image: Middle Earth
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/dybro/lists/lord-of-the-rings
   Fast & Furious:
@@ -126,6 +134,7 @@ collections:
       - name: multi-franchise
         image: Fast & Furious
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/vargajoe/lists/fast-and-furious-chronology
   Star Trek:
@@ -135,6 +144,7 @@ collections:
       - name: multi-franchise
         image: Star Trek
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/arachn0id/lists/star-trek-movies
   Rocky / Creed:
@@ -144,6 +154,7 @@ collections:
       - name: multi-franchise
         image: Rocky Creed
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/strangerer/lists/rocky
     name_mapping: Rocky Creed
@@ -154,5 +165,6 @@ collections:
       - name: multi-franchise
         image: The Mummy
       - name: shared
+      - name: arr
       - name: custom
     trakt_list: https://trakt.tv/users/rzepkowski/lists/the-mummy-movies

PMM/playlist.yml

@@ -54,6 +54,9 @@
 #          item_sonarr_tag_key:                             #
 #############################################################
 
+external_templates:
+  git: PMM/templates
+
 templates:
   playlist:
     default:

PMM/show/franchise.yml

@@ -35,6 +35,9 @@ templates:
       minimum_items: 2
     optional:
       - sonarr_add_missing
+      - sonarr_folder
+      - sonarr_tag
+      - item_sonarr_tag
       - name_mapping
       - sort_title
       - build_collection
@@ -84,4 +87,4 @@ dynamic_collections:
       1431: [1620, 2458, 122194, 61811] # CSI: Miami, NY, Cyber, Vegas
       951: [25641, 4489, 24211, 9829, 605, 69050, 79242, 87539] # The Archie Show, Sabrina, The Teenage Witch, Josie and the Pussycats, Josie and the Pussycats in Outer Space, The New Archies, Riverdale, Chilling Adventures of Sabrina, Katy Keene
       31917: [46958, 79863, 110531] # Pretty Little Liars: Ravenswood, The Perfectionists, Original Sin
-      6357: [1918, 83135, 16399]  # The Twilight Zone (multiple)
+      6357: [1918, 83135, 16399]  # The Twilight Zone (multiple)

PMM/streaming.yml

@@ -80,20 +80,9 @@ templates:
   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>>>>
     ignore_blank_results: true
     cache_builders: 1
-    smart_label: <<sort_by>>
+    smart_label: <<sort_by_<<key>>>>
     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
@@ -129,4 +118,3 @@ dynamic_collections:
       - streaming
       - shared
       - arr
-      - custom

PMM/templates.yml

@@ -38,7 +38,7 @@ templates:
       item_sonarr_tag_<<key>>: <<item_sonarr_tag>>
     optional:
       - use_<<key>>
-      - library_type
+      - allowed_libraries
       - collection_mode
       - visible_library_<<key>>
       - visible_home_<<key>>
@@ -47,7 +47,7 @@ templates:
       - item_sonarr_tag
     allowed_library_types:
       - <<use_<<key>>>>
-      - <<library_type>>
+      - <<allowed_libraries>>
     ignore_blank_results: true
     collection_mode: <<collection_mode>>
     visible_library: <<visible_library_<<key>>>>