From 28cb776082cca54d78c2e6d32f43242525c8d550 Mon Sep 17 00:00:00 2001 From: Yozora XCII Date: Sat, 23 Mar 2024 00:05:03 +0000 Subject: [PATCH 1/2] fix white-space for annotations --- docs/stylesheets/extra.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css index 8a1a5f51..478ea49c 100644 --- a/docs/stylesheets/extra.css +++ b/docs/stylesheets/extra.css @@ -19,7 +19,7 @@ strong { } table tr td code { - white-space: nowrap; + white-space: pre; } .md-banner { From 0b0c559fbf75b9e5097950b88ee988c3c44babe1 Mon Sep 17 00:00:00 2001 From: Yozora XCII Date: Mon, 25 Mar 2024 20:28:11 +0000 Subject: [PATCH 2/2] update `streaming` limit to 10,000 due to error. Add admonition explaining `originals_key` for streaming file. --- CHANGELOG | 1 + defaults/overlays/streaming.yml | 2 +- docs/defaults/both/streaming.md | 48 ++++++++++++++++------------- docs/defaults/overlays/streaming.md | 46 +++++++++++++++------------ 4 files changed, 55 insertions(+), 42 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b1aaddcd..2c4be0de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ Added [Trakt and MyAnimeList Authentication Page](https://metamanager.wiki/en/la # Updates Reworked PMM Default Streaming [Collections](https://metamanager.wiki/en/latest/defaults/both/streaming) and [Overlays](https://metamanager.wiki/en/latest/defaults/overlays/streaming) to utilize TMDB Watch Provider data, allowing users to customize regions without relying on mdblist. This data will be more accurate and up-to-date now. +* As a result of this change, if you are using custom images with this defaults file, you must replace any mention of <> in the filename with <>. Added new [`trakt_chart` attributes](https://metamanager.wiki/en/latest/files/builders/trakt/#trakt-chart) `network_ids`, `studio_ids`, `votes`, `tmdb_ratings`, `tmdb_votes`, `imdb_ratings`, `imdb_votes`, `rt_meters`, `rt_user_meters`, `metascores` and removed the deprecated `network` attribute Trakt Builder `trakt_userlist` value `recommendations` removed and `favorites` added. Mass Update operations now can be given a list of sources to fall back on when one fails including a manual source. diff --git a/defaults/overlays/streaming.yml b/defaults/overlays/streaming.yml index 2cd18a71..57ebb5c2 100644 --- a/defaults/overlays/streaming.yml +++ b/defaults/overlays/streaming.yml @@ -51,7 +51,7 @@ templates: mdb_streaming: default: region: "US" - limit: "100000" + limit: "10000" originals_only: false optional: - use_<> diff --git a/docs/defaults/both/streaming.md b/docs/defaults/both/streaming.md index 2298dbbd..2d97da15 100644 --- a/docs/defaults/both/streaming.md +++ b/docs/defaults/both/streaming.md @@ -11,27 +11,33 @@ Supported Library Types: Movie, Show ## Collections Section 030 -| Collection | Key | Description | -|:---------------------------|:--------------|:-------------------------------------------------------------------------------| -| `Streaming Collections` | `separator` | [Separator Collection](../separators.md) to denote the Section of Collections. | -| `All 4 Movies/Shows` | `all4` | Collection of Movies/Shows Streaming on All 4. | -| `Apple TV+ Movies/Shows` | `appletv` | Collection of Movies/Shows Streaming on Apple TV+. | -| `BET+ Movies/Shows` | `bet` | Collection of Movies/Shows Streaming on BET+. | -| `BritBox Movies/Shows` | `britbox` | Collection of Movies/Shows Streaming on BritBox. | -| `Crave Movies/Shows` | `crave` | Collection of Movies/Shows Streaming on Crave. | -| `Crunchyroll Shows` | `crunchyroll` | Collection of Shows Streaming on Crunchyroll. | -| `discovery+ Shows` | `discovery` | Collection of Shows Streaming on discovery+. | -| `Disney+ Movies/Shows` | `disney` | Collection of Movies/Shows Streaming on Disney+. | -| `Max Movies/Shows` | `max` | Collection of Movies/Shows Streaming on Max. | -| `Hayu Shows` | `hayu` | Collection of Shows Streaming on Hulu. | -| `Hulu Movies/Shows` | `hulu` | Collection of Movies/Shows Streaming on Hulu. | -| `Netflix Movies/Shows` | `netflix` | Collection of Movies/Shows Streaming on Netflix. | -| `NOW Movies/Shows` | `now` | Collection of Movies/Shows Streaming on NOW. | -| `Paramount+ Movies/Shows` | `paramount` | Collection of Movies/Shows Streaming on Paramount+. | -| `Peacock Movies/Shows` | `peacock` | Collection of Movies/Shows Streaming on Peacock. | -| `Prime Video Movies/Shows` | `amazon` | Collection of Movies/Shows Streaming on Prime Video. | -| `Showtime Movies/Shows` | `showtime` | Collection of Movies/Shows Streaming on Showtime. | -| `YouTube Movies/Shows` | `youtube` | Collection of Movies/Shows Streaming on YouTube. | +!!! important + + As of Plex Meta Manager release 1.21, the keys associated with this Defaults file has changed. + + If you are setting custom images, you will need to use `<>` + +| Collection | Key | `originals_key` | Description | +|:---------------------------|---------------|:-----------------|:-------------------------------------------------------------------------------| +| `Streaming Collections` | `separator` | `separator` | [Separator Collection](../separators.md) to denote the Section of Collections. | +| `All 4 Movies/Shows` | `103` | `all4` | Collection of Movies/Shows Streaming on All 4. | +| `Apple TV+ Movies/Shows` | `350` | `appletv` | Collection of Movies/Shows Streaming on Apple TV+. | +| `BET+ Movies/Shows` | `1759` | `bet` | Collection of Movies/Shows Streaming on BET+. | +| `BritBox Movies/Shows` | `151` | `britbox` | Collection of Movies/Shows Streaming on BritBox. | +| `Crave Movies/Shows` | `230` | `crave` | Collection of Movies/Shows Streaming on Crave. | +| `Crunchyroll Shows` | `283` | `crunchyroll` | Collection of Shows Streaming on Crunchyroll. | +| `discovery+ Shows` | `510` | `discovery` | Collection of Shows Streaming on discovery+. | +| `Disney+ Movies/Shows` | `337` | `disney` | Collection of Movies/Shows Streaming on Disney+. | +| `Max Movies/Shows` | `1189` | `max` | Collection of Movies/Shows Streaming on Max. | +| `Hayu Shows` | `223` | `hayu` | Collection of Shows Streaming on Hulu. | +| `Hulu Movies/Shows` | `15` | `hulu` | Collection of Movies/Shows Streaming on Hulu. | +| `Netflix Movies/Shows` | `8` | `netflix` | Collection of Movies/Shows Streaming on Netflix. | +| `NOW Movies/Shows` | `39` | `now` | Collection of Movies/Shows Streaming on NOW. | +| `Paramount+ Movies/Shows` | `531` | `paramount` | Collection of Movies/Shows Streaming on Paramount+. | +| `Peacock Movies/Shows` | `387` | `peacock` | Collection of Movies/Shows Streaming on Peacock. | +| `Prime Video Movies/Shows` | `9` | `amazon` | Collection of Movies/Shows Streaming on Prime Video. | +| `Showtime Movies/Shows` | `37` | `showtime` | Collection of Movies/Shows Streaming on Showtime. | +| `YouTube Movies/Shows` | `188` | `youtube` | Collection of Movies/Shows Streaming on YouTube. | ## Regional Variants diff --git a/docs/defaults/overlays/streaming.md b/docs/defaults/overlays/streaming.md index 35a35195..f20f2aa6 100644 --- a/docs/defaults/overlays/streaming.md +++ b/docs/defaults/overlays/streaming.md @@ -12,26 +12,32 @@ Supported Overlay Level: Movie, Show ## Supported Streaming Services -| Streaming Service | Key | Weight | -|:------------------|:--------------|:-------| -| Netflix | `netflix` | `160` | -| Prime Video | `amazon` | `150` | -| Disney+ | `disney` | `140` | -| Max | `max` | `130` | -| Crunchyroll | `Crunchyroll` | `120` | -| YouTube | `youtube` | `110` | -| Hulu | `hulu` | `100` | -| Paramount+ | `paramount` | `90` | -| AppleTV | `appletv` | `80` | -| Peacock | `peacock` | `70` | -| Showtime | `showtime` | `60` | -| discovery+ | `discovery` | `58` | -| Crave | `crave` | `55` | -| NOW | `now` | `50` | -| All 4 | `all4` | `40` | -| britbox | `britbox` | `30` | -| BET+ | `bet` | `20` | -| hayu | `hayu` | `10` | +!!! important + + As of Plex Meta Manager release 1.21, the keys associated with this Defaults file has changed. + + If you are setting custom images, you will need to use `<>` + +| Streaming Service | Key | `originals_key` | Weight | +|:------------------|--------|:----------------|:-------| +| Netflix | `8` | `netflix` | `160` | +| Prime Video | `9` | `amazon` | `150` | +| Disney+ | `337` | `disney` | `140` | +| Max | `1189` | `max` | `130` | +| Crunchyroll | `283` | `Crunchyroll` | `120` | +| YouTube | `188` | `youtube` | `110` | +| Hulu | `15` | `hulu` | `100` | +| Paramount+ | `531` | `paramount` | `90` | +| AppleTV | `350` | `appletv` | `80` | +| Peacock | `387` | `peacock` | `70` | +| Showtime | `37` | `showtime` | `60` | +| discovery+ | `510` | `discovery` | `58` | +| Crave | `230` | `crave` | `55` | +| NOW | `39` | `now` | `50` | +| All 4 | `103` | `all4` | `40` | +| britbox | `151` | `britbox` | `30` | +| BET+ | `1759` | `bet` | `20` | +| hayu | `223` | `hayu` | `10` | ## Regional Variants