From 01e1959268f5c67f6d80e597df9e34dde3ba1c85 Mon Sep 17 00:00:00 2001 From: nharris Date: Sat, 21 Jan 2023 12:20:14 -0700 Subject: [PATCH] - Split FX from Fox for network library - Move studios from "TV Shows" library to all show libraries - Add required search query for building per-actor, per-director, per-country and per-genre dynamic collections - Add Per_Network dynamic collection template (not enabled) - Add and enable per-actor dynamic collection for all show libraries - Remove incompatible custom collection order for "Studio" template --- .../TVShows/TV_Shows_collections.yml | 318 ----------------- .../general/movies_collections_general.yml | 2 +- .../general/shows_collections_general.yml | 337 ++++++++++++++++++ plex/pmm/templates/collections.yml | 1 - plex/pmm/templates/dynamic_collections.yml | 23 ++ 5 files changed, 361 insertions(+), 320 deletions(-) diff --git a/plex/pmm/collections/TVShows/TV_Shows_collections.yml b/plex/pmm/collections/TVShows/TV_Shows_collections.yml index 70eddff..b231c9d 100644 --- a/plex/pmm/collections/TVShows/TV_Shows_collections.yml +++ b/plex/pmm/collections/TVShows/TV_Shows_collections.yml @@ -116,321 +116,3 @@ collections: visible_home: false visible_shared: false - ### Studios - ABC: - template: { name: Network, - network: "ABC, ABC (AU), ABS (US), ABC Comedy, ABC Family, ABC Me, ABC Spark, ABC.com, ABC1, ABC3" , - poster: https://theposterdb.com/api/assets/113115 } - summary: Shows Aired on ABC - visible_library: true - visible_home: false - visible_shared: false - - Adult Swim: - template: { name: Network, - network: "Adult Swim", - poster: https://theposterdb.com/api/assets/113116 } - summary: Shows Aired on Adult Swim - visible_library: true - visible_home: false - visible_shared: false - - A&E: - template: { name: Network, - network: "A&E", - poster: https://theposterdb.com/api/assets/113113 } - summary: Shows Aired on A&E - visible_library: true - visible_home: false - visible_shared: false - - AMC: - template: { name: Network, - network: "AMC, AMC+", - poster: https://theposterdb.com/api/assets/113118 } - summary: Shows Aired on AMC - visible_library: true - visible_home: false - visible_shared: false - - "Apple TV+": - template: { name: Network, - network: "Apple TV+, Apple Music", - poster: https://theposterdb.com/api/assets/113121 } - summary: "Apple TV+ Original Shows" - visible_library: true - visible_home: false - visible_shared: false - - BBC: - template: { name: Network, - network: "BBC, BBC America, BBC Choice, BBC First, BBC Four, BBC HD, BBC iPlayer, BBC One, BBC Two, BBC Three, BBC UKTV, CBBC, Cbeebies", - poster: https://theposterdb.com/api/assets/113123 } - summary: BBC Original Shows - visible_library: true - visible_home: false - visible_shared: false - - Cartoon Network: - template: { name: Network, - network: "Cartoon Network", - poster: https://theposterdb.com/api/assets/113135 } - summary: Shows Aired on Cartoon Network - visible_library: true - visible_home: false - visible_shared: false - - CBS: - template: { name: Network, - network: "CBS, CBS All Access, CBS Reality, CBS Reality (UK), CBS.com", - poster: https://theposterdb.com/api/assets/113138 } - summary: Shows Aired on CBS - visible_library: true - visible_home: false - visible_shared: false - - Channel 4: - template: { name: Network, - network: "Channel 4, E4, More4, 4Seven, Film4", - poster: https://theposterdb.com/api/assets/113139 } - summary: Shows Aired on Channel 4 - visible_library: true - visible_home: false - visible_shared: false - - Cinemax: - template: { name: Network, - network: "Cinemax", - poster: https://theposterdb.com/api/assets/113140 } - summary: Shows Aired on Cinemax - visible_library: true - visible_home: false - visible_shared: false - - Comedy Central: - template: { name: Network, - network: "Comedy Central, Comedy Central (UK)", - poster: https://theposterdb.com/api/assets/113146 } - summary: Shows Aired on Comedy Central - visible_library: true - visible_home: false - visible_shared: false - - Discovery Channel: - template: { name: Network, - network: "Discovery, Discovery Channel, Discovery Channel (AU), Discovery Channel (CA), Discovery Channel (UK), Discovery Health Channel, Discovery Kids, Discovery Life, Discovery Real Time, Discovery Turbo, Discovery Turbo UK, Discovery+", - poster: https://theposterdb.com/api/assets/113157 } - summary: Shows Aired on Discovery Channel - visible_library: true - visible_home: false - visible_shared: false - - "Disney+": - template: { name: Network, - network: "Disney Channel, Disney Channel (UK), Disney Junior, Disney XD, Disney+, Disney+ Hostar", - poster: https://theposterdb.com/api/assets/113161 } - summary: "Disney+ Original Shows" - visible_library: true - visible_home: false - visible_shared: false - - ESPN: - template: { name: Network, - network: "ESPN, ESPN2, ESPN3, ESPNU, ESPN+, ESPNU+", - poster: https://theposterdb.com/api/assets/113167 } - summary: Shows Aired on ESPN - visible_library: true - visible_home: false - visible_shared: false - - FOX: - template: { name: Network, - network: "FX, FOX, Fox Action Movies, Fox Business Network, Fox Kids, Fox Premium Series, FOX Sports 1, Fox Sports Networks", - poster: https://theposterdb.com/api/assets/113173 } - summary: Shows Aired on FOX - visible_library: true - visible_home: false - visible_shared: false - - HBO: - template: { name: Network, - network: "HBO, HBO Canada, HBO Europe, HBO Max", - poster: https://theposterdb.com/api/assets/113186 } - summary: HBO Orginal Shows - visible_library: true - visible_home: false - visible_shared: false - - History Channel: - template: { name: Network, - network: "History, History (CA), History (UK), History Channel, History Channel (AU)", - poster: https://theposterdb.com/api/assets/113187 } - summary: Shows Aired on History Channel - visible_library: true - visible_home: false - visible_shared: false - - HGTV: - template: { name: Network, - network: "HGTV, HGTV (AU), HGTV Canada", - poster: https://theposterdb.com/api/assets/113183 } - summary: Shows Aired on HGTV - visible_library: true - visible_home: false - visible_shared: false - - Hulu: - template: { name: Network, - network: "Hulu", - poster: https://theposterdb.com/api/assets/113188 } - summary: Hulu Original Shows - visible_library: true - visible_home: false - visible_shared: false - - ITV: - template: { name: Network, - network: "ITV, ITV2, ITV3, ITV4, ITVBe, CITV", - poster: https://theposterdb.com/api/assets/113192 } - summary: Shows Aired on ITV - visible_library: true - visible_home: false - visible_shared: false - - MTV: - template: { name: Network, - network: "MTV, MTV (AU/NZ), MTV (UK), MTV2, MTV3", - poster: https://theposterdb.com/api/assets/113202 } - summary: Shows Aired on MTV - visible_library: true - visible_home: false - visible_shared: false - - National Geographic: - template: { name: Network, - network: "National Geographic, National Geographic (UK), National Geographic Brasil, National Geographic Channel, National Geographic Wild", - poster: https://theposterdb.com/api/assets/113206 } - summary: Shows Aired on National Geographic - visible_library: true - visible_home: false - visible_shared: false - - NBC: - template: { name: Studio, - poster: https://theposterdb.com/api/assets/113217 } - tmdb_network: 6 - summary: Shows Aired on NBC - visible_library: true - visible_home: false - visible_shared: false - - NBCUniversal: - template: { name: Network, - network: "Bravo, CNBC, E!, MSNBC, NBC, Oxygen, Peacock, SyFy", - poster: https://theposterdb.com/api/assets/113217 } - summary: NBCUniversal Original Shows - visible_library: true - visible_home: false - visible_shared: false - - Netflix: - template: { name: Studio, - poster: https://theposterdb.com/api/assets/113218 } - tmdb_network: 213 - summary: Netflix Orginal Shows - visible_library: true - visible_home: false - visible_shared: false - - Nickelodeon: - template: { name: Network, - network: "Nick Jr., Nickelodeon, Nicktoons, TeenNick", - poster: https://theposterdb.com/api/assets/113231 } - summary: Shows Aired on Nickelodeon - visible_library: true - visible_home: false - visible_shared: false - - PBS: - template: { name: Network, - network: "PBS, PBS Kids", - poster: https://theposterdb.com/api/assets/113244 } - summary: Shows Aired on PBS - visible_library: true - visible_home: false - visible_shared: false - - Prime Video: - template: { name: Network, - network: "Amazon, Amazon Prime Video, Prime Video", - poster: https://theposterdb.com/api/assets/113247 } - summary: Prime Video Original Shows - visible_library: true - visible_home: false - visible_shared: false - - Quibi: - template: { name: Studio, - poster: https://theposterdb.com/api/assets/115020 } - imdb_list: - - https://www.imdb.com/list/ls085112163 - summary: Quibi Original Shows - visible_library: true - visible_home: false - visible_shared: false - - - Showtime: - template: { name: Studio, - poster: https://theposterdb.com/api/assets/113257 } - tmdb_network: 67 - summary: Showtime Orginal Shows - visible_library: true - visible_home: false - visible_shared: false - - Sky: - template: { name: Network, - network: "Sky 1, Sky Arts, Sky Atlantic, Sky Atlantic (UK), Sky Cinema, Sky Crime, Sky Documentaries, Sky Living, Sky Max, Sky Nature, Sky One, Sky Sports, Sky Two, Sky Witness, Sky1", - poster: https://i.imgur.com/qBS4e5P.jpg } - summary: Shows Aired on Sky - visible_library: true - visible_home: false - visible_shared: false - - Starz: - template: { name: Studio, - poster: https://theposterdb.com/api/assets/113265 } - tmdb_network: 318 - summary: Starz Orginal Shows - visible_library: true - visible_home: false - visible_shared: false - - SyFy: - template: { name: Studio, - poster: https://theposterdb.com/api/assets/113267 } - tmdb_network: 77 - summary: Shows Aired on SYFY - visible_library: true - visible_home: false - visible_shared: false - - TBS: - template: { name: Network, - network: "TBS", - poster: https://theposterdb.com/api/assets/113267 } - summary: TBS Original Shows - visible_library: true - visible_home: false - visible_shared: false - - YouTube: - template: { name: Network, - network: "YouTube, YouTube Premium", - poster: https://theposterdb.com/api/assets/113301 } - summary: Shows Aired on YouTube - visible_library: true - visible_home: false - visible_shared: false - diff --git a/plex/pmm/collections/general/movies_collections_general.yml b/plex/pmm/collections/general/movies_collections_general.yml index fb909aa..30d32f4 100644 --- a/plex/pmm/collections/general/movies_collections_general.yml +++ b/plex/pmm/collections/general/movies_collections_general.yml @@ -457,7 +457,7 @@ dynamic_collections: template: - Best_of_Year - Per-Actor DC: # mapping name does not matter just needs to be unique + Per-Actor-Movies DC: # mapping name does not matter just needs to be unique type: actor data: depth: 10 # must be in top X billed actors for a given movie for the movie to be added diff --git a/plex/pmm/collections/general/shows_collections_general.yml b/plex/pmm/collections/general/shows_collections_general.yml index 53d2c4e..ba55c69 100644 --- a/plex/pmm/collections/general/shows_collections_general.yml +++ b/plex/pmm/collections/general/shows_collections_general.yml @@ -2,6 +2,343 @@ external_templates: - repo: templates/collections + - repo: templates/dynamic_collections collections: + ### Studios + ABC: + template: { name: Network, + network: "ABC, ABC (AU), ABS (US), ABC Comedy, ABC Family, ABC Me, ABC Spark, ABC.com, ABC1, ABC3" , + poster: https://theposterdb.com/api/assets/113115 } + summary: Shows Aired on ABC + visible_library: true + visible_home: false + visible_shared: false + Adult Swim: + template: { name: Network, + network: "Adult Swim", + poster: https://theposterdb.com/api/assets/113116 } + summary: Shows Aired on Adult Swim + visible_library: true + visible_home: false + visible_shared: false + + A&E: + template: { name: Network, + network: "A&E", + poster: https://theposterdb.com/api/assets/113113 } + summary: Shows Aired on A&E + visible_library: true + visible_home: false + visible_shared: false + + AMC: + template: { name: Network, + network: "AMC, AMC+", + poster: https://theposterdb.com/api/assets/113118 } + summary: Shows Aired on AMC + visible_library: true + visible_home: false + visible_shared: false + + "Apple TV+": + template: { name: Network, + network: "Apple TV+, Apple Music", + poster: https://theposterdb.com/api/assets/113121 } + summary: "Apple TV+ Original Shows" + visible_library: true + visible_home: false + visible_shared: false + + BBC: + template: { name: Network, + network: "BBC, BBC America, BBC Choice, BBC First, BBC Four, BBC HD, BBC iPlayer, BBC One, BBC Two, BBC Three, BBC UKTV, CBBC, Cbeebies", + poster: https://theposterdb.com/api/assets/113123 } + summary: BBC Original Shows + visible_library: true + visible_home: false + visible_shared: false + + Cartoon Network: + template: { name: Network, + network: "Cartoon Network", + poster: https://theposterdb.com/api/assets/113135 } + summary: Shows Aired on Cartoon Network + visible_library: true + visible_home: false + visible_shared: false + + CBS: + template: { name: Network, + network: "CBS, CBS All Access, CBS Reality, CBS Reality (UK), CBS.com", + poster: https://theposterdb.com/api/assets/113138 } + summary: Shows Aired on CBS + visible_library: true + visible_home: false + visible_shared: false + + Channel 4: + template: { name: Network, + network: "Channel 4, E4, More4, 4Seven, Film4", + poster: https://theposterdb.com/api/assets/113139 } + summary: Shows Aired on Channel 4 + visible_library: true + visible_home: false + visible_shared: false + + Cinemax: + template: { name: Network, + network: "Cinemax", + poster: https://theposterdb.com/api/assets/113140 } + summary: Shows Aired on Cinemax + visible_library: true + visible_home: false + visible_shared: false + + Comedy Central: + template: { name: Network, + network: "Comedy Central, Comedy Central (UK)", + poster: https://theposterdb.com/api/assets/113146 } + summary: Shows Aired on Comedy Central + visible_library: true + visible_home: false + visible_shared: false + + Discovery Channel: + template: { name: Network, + network: "Discovery, Discovery Channel, Discovery Channel (AU), Discovery Channel (CA), Discovery Channel (UK), Discovery Health Channel, Discovery Kids, Discovery Life, Discovery Real Time, Discovery Turbo, Discovery Turbo UK, Discovery+", + poster: https://theposterdb.com/api/assets/113157 } + summary: Shows Aired on Discovery Channel + visible_library: true + visible_home: false + visible_shared: false + + "Disney+": + template: { name: Network, + network: "Disney Channel, Disney Channel (UK), Disney Junior, Disney XD, Disney+, Disney+ Hostar", + poster: https://theposterdb.com/api/assets/113161 } + summary: "Disney+ Original Shows" + visible_library: true + visible_home: false + visible_shared: false + + ESPN: + template: { name: Network, + network: "ESPN, ESPN2, ESPN3, ESPNU, ESPN+, ESPNU+", + poster: https://theposterdb.com/api/assets/113167 } + summary: Shows Aired on ESPN + visible_library: true + visible_home: false + visible_shared: false + + FOX: + template: { name: Network, + network: "FOX, Fox Action Movies, Fox Business Network, Fox Kids, Fox Premium Series, FOX Sports 1, Fox Sports Networks", + poster: https://theposterdb.com/api/assets/113173 } + summary: Shows Aired on FOX + visible_library: true + visible_home: false + visible_shared: false + + FX: + template: { name: Network, + network: "FX, FXX, FXM", + poster: https://theposterdb.com/api/assets/113174 } + summary: Shows Aired on FX + visible_library: true + visible_home: false + visible_shared: false + + HBO: + template: { name: Network, + network: "HBO, HBO Canada, HBO Europe, HBO Max", + poster: https://theposterdb.com/api/assets/113186 } + summary: HBO Orginal Shows + visible_library: true + visible_home: false + visible_shared: false + + History Channel: + template: { name: Network, + network: "History, History (CA), History (UK), History Channel, History Channel (AU)", + poster: https://theposterdb.com/api/assets/113187 } + summary: Shows Aired on History Channel + visible_library: true + visible_home: false + visible_shared: false + + HGTV: + template: { name: Network, + network: "HGTV, HGTV (AU), HGTV Canada", + poster: https://theposterdb.com/api/assets/113183 } + summary: Shows Aired on HGTV + visible_library: true + visible_home: false + visible_shared: false + + Hulu: + template: { name: Network, + network: "Hulu", + poster: https://theposterdb.com/api/assets/113188 } + summary: Hulu Original Shows + visible_library: true + visible_home: false + visible_shared: false + + ITV: + template: { name: Network, + network: "ITV, ITV2, ITV3, ITV4, ITVBe, CITV", + poster: https://theposterdb.com/api/assets/113192 } + summary: Shows Aired on ITV + visible_library: true + visible_home: false + visible_shared: false + + MTV: + template: { name: Network, + network: "MTV, MTV (AU/NZ), MTV (UK), MTV2, MTV3", + poster: https://theposterdb.com/api/assets/113202 } + summary: Shows Aired on MTV + visible_library: true + visible_home: false + visible_shared: false + + National Geographic: + template: { name: Network, + network: "National Geographic, National Geographic (UK), National Geographic Brasil, National Geographic Channel, National Geographic Wild", + poster: https://theposterdb.com/api/assets/113206 } + summary: Shows Aired on National Geographic + visible_library: true + visible_home: false + visible_shared: false + + NBC: + template: { name: Studio, + poster: https://theposterdb.com/api/assets/113217 } + tmdb_network: 6 + summary: Shows Aired on NBC + visible_library: true + visible_home: false + visible_shared: false + + NBCUniversal: + template: { name: Network, + network: "Bravo, CNBC, E!, MSNBC, NBC, Oxygen, Peacock, SyFy", + poster: https://theposterdb.com/api/assets/113217 } + summary: NBCUniversal Original Shows + visible_library: true + visible_home: false + visible_shared: false + + Netflix: + template: { name: Studio, + poster: https://theposterdb.com/api/assets/113218 } + tmdb_network: 213 + summary: Netflix Orginal Shows + visible_library: true + visible_home: false + visible_shared: false + + Nickelodeon: + template: { name: Network, + network: "Nick Jr., Nickelodeon, Nicktoons, TeenNick", + poster: https://theposterdb.com/api/assets/113231 } + summary: Shows Aired on Nickelodeon + visible_library: true + visible_home: false + visible_shared: false + + PBS: + template: { name: Network, + network: "PBS, PBS Kids", + poster: https://theposterdb.com/api/assets/113244 } + summary: Shows Aired on PBS + visible_library: true + visible_home: false + visible_shared: false + + Prime Video: + template: { name: Network, + network: "Amazon, Amazon Prime Video, Prime Video", + poster: https://theposterdb.com/api/assets/113247 } + summary: Prime Video Original Shows + visible_library: true + visible_home: false + visible_shared: false + + Quibi: + template: { name: Studio, + poster: https://theposterdb.com/api/assets/115020 } + imdb_list: + - https://www.imdb.com/list/ls085112163 + summary: Quibi Original Shows + visible_library: true + visible_home: false + visible_shared: false + + + Showtime: + template: { name: Studio, + poster: https://theposterdb.com/api/assets/113257 } + tmdb_network: 67 + summary: Showtime Orginal Shows + visible_library: true + visible_home: false + visible_shared: false + + Sky: + template: { name: Network, + network: "Sky 1, Sky Arts, Sky Atlantic, Sky Atlantic (UK), Sky Cinema, Sky Crime, Sky Documentaries, Sky Living, Sky Max, Sky Nature, Sky One, Sky Sports, Sky Two, Sky Witness, Sky1", + poster: https://i.imgur.com/qBS4e5P.jpg } + summary: Shows Aired on Sky + visible_library: true + visible_home: false + visible_shared: false + + Starz: + template: { name: Studio, + poster: https://theposterdb.com/api/assets/113265 } + tmdb_network: 318 + summary: Starz Orginal Shows + visible_library: true + visible_home: false + visible_shared: false + + SyFy: + template: { name: Studio, + poster: https://theposterdb.com/api/assets/113267 } + tmdb_network: 77 + summary: Shows Aired on SYFY + visible_library: true + visible_home: false + visible_shared: false + + TBS: + template: { name: Network, + network: "TBS", + poster: https://theposterdb.com/api/assets/113267 } + summary: TBS Original Shows + visible_library: true + visible_home: false + visible_shared: false + + YouTube: + template: { name: Network, + network: "YouTube, YouTube Premium", + poster: https://theposterdb.com/api/assets/113301 } + summary: Shows Aired on YouTube + visible_library: true + visible_home: false + visible_shared: false + +dynamic_collections: + ## Use DC as suffix to avoid name conflicts with static collections + Per-Actor-Shows DC: # mapping name does not matter just needs to be unique + type: actor + data: + depth: 10 # must be in top X billed actors for a given show for the show to be added + minimum: 3 # actor must be in at least X shows to have a collection made + title_format: <> (Actor) + template: + - Per_Actor diff --git a/plex/pmm/templates/collections.yml b/plex/pmm/templates/collections.yml index db3f64b..977333a 100644 --- a/plex/pmm/templates/collections.yml +++ b/plex/pmm/templates/collections.yml @@ -160,7 +160,6 @@ templates: - poster sort_title: 10_+<>_<> sync_mode: sync - collection_order: custom schedule: daily visible_library: true url_poster: <> diff --git a/plex/pmm/templates/dynamic_collections.yml b/plex/pmm/templates/dynamic_collections.yml index bdf9fb9..4a42d9d 100644 --- a/plex/pmm/templates/dynamic_collections.yml +++ b/plex/pmm/templates/dynamic_collections.yml @@ -17,6 +17,11 @@ templates: schedule: monthly(1) Per_Genre: + smart_filter: + limit: 10000 + sort_by: critic_rating.desc + all: + genre: <> default: level: "" sort_title: 07_+<>_<> @@ -26,6 +31,9 @@ templates: schedule: weekly(saturday) Per_Actor: + plex_search: + any: + actor: <> default: level: "" sort_title: 09_+<>_<> @@ -35,6 +43,9 @@ templates: schedule: weekly(thursday), weekly(monday) Per_Director: + plex_search: + any: + director: <> default: level: "" sort_title: 09_+<>_<> @@ -44,6 +55,11 @@ templates: schedule: weekly(friday), weekly(tuesday) Per_Country: + smart_filter: + limit: 10000 + sort_by: critic_rating.desc + any: + country: <> default: level: "" sort_title: 11_+<>_<> @@ -51,3 +67,10 @@ templates: visible_shared: false visible_home: false schedule: weekly(saturday) + + Per_Network: + smart_filter: + sort_by: critic_rating.desc + all: + network: <> +