From 01b9c7e0ff57c93f6671b15c54afe584cd209112 Mon Sep 17 00:00:00 2001 From: johnfawkes <33303104+JohnFawkes@users.noreply.github.com> Date: Thu, 22 Sep 2022 00:23:15 -0400 Subject: [PATCH 1/8] Update franchise.yml Adding to optional to fix an issue of <> being added as a tag to radarr --- PMM/movie/franchise.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PMM/movie/franchise.yml b/PMM/movie/franchise.yml index eacd427c..89337ea0 100644 --- a/PMM/movie/franchise.yml +++ b/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: <> tmdb_collection_details: <> From b858735ff4f688ff9d4c083c5a90bb559fa2d43f Mon Sep 17 00:00:00 2001 From: johnfawkes <33303104+JohnFawkes@users.noreply.github.com> Date: Thu, 22 Sep 2022 00:25:07 -0400 Subject: [PATCH 2/8] Update franchise.yml Fix same issue as previous but for sonarr --- PMM/show/franchise.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PMM/show/franchise.yml b/PMM/show/franchise.yml index c5c618c9..bb15afe4 100644 --- a/PMM/show/franchise.yml +++ b/PMM/show/franchise.yml @@ -38,6 +38,9 @@ templates: - name_mapping - sort_title - build_collection + - sonarr_folder + - sonarr_tag + - item_sonarr_tag minimum_items: <> tmdb_show: <> url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/franchise/<>.jpg @@ -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) \ No newline at end of file + 6357: [1918, 83135, 16399] # The Twilight Zone (multiple) From 3a0ffd214ffdf1153c53df60e4b8922d973c247a Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Thu, 22 Sep 2022 02:16:54 -0400 Subject: [PATCH 3/8] update streaming and seasonal --- PMM/movie/seasonal.yml | 98 ++++++++++++++++++++++++------------------ PMM/show/franchise.yml | 6 +-- PMM/streaming.yml | 13 +----- 3 files changed, 60 insertions(+), 57 deletions(-) diff --git a/PMM/movie/seasonal.yml b/PMM/movie/seasonal.yml index 163ebfb5..70770ad5 100644 --- a/PMM/movie/seasonal.yml +++ b/PMM/movie/seasonal.yml @@ -79,45 +79,11 @@ templates: key: <> sort_by: title.asc sort_by_<>: <> - visible_home_<>: true - visible_shared_<>: true - radarr_add_missing_<>: <> - sonarr_add_missing_<>: <> - radarr_folder_<>: <> - sonarr_folder_<>: <> - radarr_tag_<>: <> - sonarr_tag_<>: <> - item_radarr_tag_<>: <> - item_sonarr_tag_<>: <> optional: - - use_<> - schedule_<> - - visible_library_<> - - radarr_add_missing - - sonarr_add_missing - - radarr_folder - - sonarr_folder - - radarr_tag - - sonarr_tag - - item_radarr_tag - - item_sonarr_tag - allowed_library_types: - - <>>> schedule: <>>> - visible_library: <>>> - visible_home: <>>> - visible_shared: <>>> - radarr_add_missing: <>>> - sonarr_add_missing: <>>> - radarr_folder: <>>> - sonarr_folder: <>>> - radarr_tag: <>>> - sonarr_tag: <>>> - item_radarr_tag: <>>> - item_sonarr_tag: <>>> smart_label: <>>> summary: A collection of <> and other movies that may relate to the season. - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/seasonal/<>.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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - 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_<>: true + visible_shared_<>: true + image: seasonal/<> + - name: arr imdb_list: https://www.imdb.com/list/ls066838460/ \ No newline at end of file diff --git a/PMM/show/franchise.yml b/PMM/show/franchise.yml index bb15afe4..1fb732ed 100644 --- a/PMM/show/franchise.yml +++ b/PMM/show/franchise.yml @@ -35,12 +35,12 @@ templates: minimum_items: 2 optional: - sonarr_add_missing - - name_mapping - - sort_title - - build_collection - sonarr_folder - sonarr_tag - item_sonarr_tag + - name_mapping + - sort_title + - build_collection minimum_items: <> tmdb_show: <> url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/franchise/<>.jpg diff --git a/PMM/streaming.yml b/PMM/streaming.yml index 4487713d..73364573 100644 --- a/PMM/streaming.yml +++ b/PMM/streaming.yml @@ -80,20 +80,9 @@ templates: streaming: default: sort_by: release.desc - key: <> - optional: - - use_<> - - visible_library_<> - - visible_home_<> - - visible_shared_<> - allowed_library_types: - - <>>> - visible_library: <>>> - visible_home: <>>> - visible_shared: <>>> ignore_blank_results: true cache_builders: 1 - smart_label: <> + smart_label: <>>> sync_mode: sync mdblist_list: https://mdblist.com/lists/plexmetamanager/<>-<>s url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/streaming/<>.jpg From ced83726947b5ad9531d25aaa124356a8e8a2379 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Thu, 22 Sep 2022 02:18:39 -0400 Subject: [PATCH 4/8] add arr template to universe --- PMM/movie/universe.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/PMM/movie/universe.yml b/PMM/movie/universe.yml index 3b2304a4..18bc70e4 100644 --- a/PMM/movie/universe.yml +++ b/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 \ No newline at end of file From 55c9c98c429ac8840b6b5d4d5dfdd906dac5b3a6 Mon Sep 17 00:00:00 2001 From: YozoraXCII <96386153+YozoraXCII@users.noreply.github.com> Date: Thu, 22 Sep 2022 13:43:04 +0100 Subject: [PATCH 5/8] Add external templates to Playlists file (#464) Co-authored-by: YozoraXCII --- PMM/playlist.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PMM/playlist.yml b/PMM/playlist.yml index a1b3800f..5e2c083c 100644 --- a/PMM/playlist.yml +++ b/PMM/playlist.yml @@ -54,6 +54,9 @@ # item_sonarr_tag_key: # ############################################################# +external_templates: + git: PMM/templates + templates: playlist: default: From 08b0124430eb6c0de1938a9ec26b3313996dd0b9 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Thu, 22 Sep 2022 10:00:42 -0400 Subject: [PATCH 6/8] change library_type --- PMM/award/bafta.yml | 2 +- PMM/award/cannes.yml | 2 +- PMM/award/oscars.yml | 4 ++-- PMM/award/other.yml | 6 +++--- PMM/award/sundance.yml | 2 +- PMM/chart/basic.yml | 2 +- PMM/chart/imdb.yml | 2 +- PMM/chart/other.yml | 4 ++-- PMM/templates.yml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PMM/award/bafta.yml b/PMM/award/bafta.yml index 3fb1b2e9..57ac9067 100644 --- a/PMM/award/bafta.yml +++ b/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 diff --git a/PMM/award/cannes.yml b/PMM/award/cannes.yml index 0d15c48d..ed0f343a 100644 --- a/PMM/award/cannes.yml +++ b/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 diff --git a/PMM/award/oscars.yml b/PMM/award/oscars.yml index a93db221..0cf8c3e9 100644 --- a/PMM/award/oscars.yml +++ b/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 diff --git a/PMM/award/other.yml b/PMM/award/other.yml index 723d2489..1a323da9 100644 --- a/PMM/award/other.yml +++ b/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 diff --git a/PMM/award/sundance.yml b/PMM/award/sundance.yml index f1a69ef5..02f53329 100644 --- a/PMM/award/sundance.yml +++ b/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 diff --git a/PMM/chart/basic.yml b/PMM/chart/basic.yml index 2f088e5f..d1080ab2 100644 --- a/PMM/chart/basic.yml +++ b/PMM/chart/basic.yml @@ -87,4 +87,4 @@ collections: template: - name: episodes - name: shared - library_type: show + allowed_libraries: show diff --git a/PMM/chart/imdb.yml b/PMM/chart/imdb.yml index 2b6ae3e6..e250c12c 100644 --- a/PMM/chart/imdb.yml +++ b/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 diff --git a/PMM/chart/other.yml b/PMM/chart/other.yml index 9516bfe1..1c82e880 100644 --- a/PMM/chart/other.yml +++ b/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 diff --git a/PMM/templates.yml b/PMM/templates.yml index 184922c2..5a2ca4a2 100644 --- a/PMM/templates.yml +++ b/PMM/templates.yml @@ -38,7 +38,7 @@ templates: item_sonarr_tag_<>: <> optional: - use_<> - - library_type + - allowed_libraries - collection_mode - visible_library_<> - visible_home_<> @@ -47,7 +47,7 @@ templates: - item_sonarr_tag allowed_library_types: - <>>> - - <> + - <> ignore_blank_results: true collection_mode: <> visible_library: <>>> From 2ab518dd2aaae1347e1cf94ffd47bda808268465 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Thu, 22 Sep 2022 10:23:01 -0400 Subject: [PATCH 7/8] fix streaming --- PMM/chart/tmdb.yml | 4 ++-- PMM/streaming.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/PMM/chart/tmdb.yml b/PMM/chart/tmdb.yml index 10c106da..fdfc8f31 100644 --- a/PMM/chart/tmdb.yml +++ b/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 diff --git a/PMM/streaming.yml b/PMM/streaming.yml index 73364573..4fbb1954 100644 --- a/PMM/streaming.yml +++ b/PMM/streaming.yml @@ -118,4 +118,3 @@ dynamic_collections: - streaming - shared - arr - - custom From ea6d0f96c5f2e61f6360bf018b8c024eb2731b26 Mon Sep 17 00:00:00 2001 From: YozoraXCII <96386153+YozoraXCII@users.noreply.github.com> Date: Thu, 22 Sep 2022 15:24:03 +0100 Subject: [PATCH 8/8] fix library_type in PMM/chart/tmdb (#465) Co-authored-by: YozoraXCII