diff --git a/VERSION b/VERSION index be556931..4a2f3a55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.0-develop49 +1.19.0-develop50 diff --git a/defaults/both/streaming.yml b/defaults/both/streaming.yml index f7c73798..f59b6ca0 100644 --- a/defaults/both/streaming.yml +++ b/defaults/both/streaming.yml @@ -21,7 +21,7 @@ templates: default: <> conditions: - originals_only: true - key: [appletv, disney, hbomax, hulu, netflix, paramount, peacock, amazon] + key: [appletv, disney, max, hulu, netflix, paramount, peacock, amazon] value: "original" allowed_streaming: conditions: @@ -35,7 +35,7 @@ templates: key: [crave] value: False - region: ca - key: [hbomax, showtime] + key: [max, showtime] value: False watch_region: default: "" @@ -101,7 +101,7 @@ dynamic_collections: discovery: discovery+ disney: Disney+ hayu: hayu - hbomax: Max + max: Max hulu: Hulu netflix: Netflix now: NOW diff --git a/defaults/overlays/streaming.yml b/defaults/overlays/streaming.yml index 77a49248..e9f54a96 100644 --- a/defaults/overlays/streaming.yml +++ b/defaults/overlays/streaming.yml @@ -60,7 +60,7 @@ templates: default: <> conditions: - originals_only: true - key: [appletv, disney, hbomax, hulu, netflix, paramount, peacock, amazon] + key: [appletv, disney, max, hulu, netflix, paramount, peacock, amazon] value: "original" allowed_streaming: conditions: @@ -74,7 +74,7 @@ templates: key: [crave] value: False - region: ca - key: [hbomax, showtime] + key: [max, showtime] value: False watch_region: default: "" @@ -121,7 +121,7 @@ overlays: template: [name: standard, name: mdb_streaming] Max: - variables: {key: hbomax, weight: 130} + variables: {key: max, weight: 130} template: [name: standard, name: mdb_streaming] Crunchyroll: diff --git a/docs/defaults/both/streaming.md b/docs/defaults/both/streaming.md index b4f23ca4..ae03e807 100644 --- a/docs/defaults/both/streaming.md +++ b/docs/defaults/both/streaming.md @@ -22,7 +22,7 @@ Supported Library Types: Movie, Show | `discovery+ Shows` | `discovery` | Collection of Shows Streaming on discovery+. | | `Disney+ Movies/Shows` | `disney` | Collection of Movies/Shows Streaming on Disney+. | | `hayu Shows` | `hayu` | Collection of Shows Streaming on hayu. | -| `Max Movies/Shows` | `hbomax` | Collection of Movies/Shows Streaming on Max. | +| `Max Movies/Shows` | `max` | Collection of Movies/Shows Streaming on Max. | | `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. | @@ -55,19 +55,19 @@ All [Shared Collection Variables](../collection_variables) are available as well This file contains a [Separator](../separators) so all [Shared Separator Variables](../separators.md#shared-separator-variables) are available as well. -| Variable | Description & Values | -|:--------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `limit` | **Description:** Changes the Builder Limit for all collections in a Defaults file.
**Values:** Number Greater then 0 | -| `limit_<>`1 | **Description:** Changes the Builder Limit of the specified key's collection.
**Default:** `limit`
**Values:** Number Greater then 0 | -| `sort_by` | **Description:** Changes the Smart Filter Sort for all collections in a Defaults file.
**Default:** `release.desc`
**Values:** [Any `smart_filter` Sort Option](../../metadata/builders/smart.md#sort-options) | -| `sort_by_<>`1 | **Description:** Changes the Smart Filter Sort of the specified key's collection.
**Default:** `sort_by`
**Values:** [Any `smart_filter` Sort Option](../../metadata/builders/smart.md#sort-options) | -| `sync_mode` | **Description:** Changes the Sync Mode for all collections in a Defaults file.
**Default:** `sync`
**Values:**
`sync`Add and Remove Items based on Builders
`append`Only Add Items based on Builders
| -| `sync_mode_<>`1 | **Description:** Changes the Sync Mode of the specified key's collection.
**Default:** `sync_mode`
**Values:**
`sync`Add and Remove Items based on Builders
`append`Only Add Items based on Builders
| -| `exclude` | **Description:** Exclude these Streaming Services from creating a Dynamic Collection.
**Values:** List of Streaming Service Keys | -| `region` | **Description:** Changes some Streaming Service lists to regional variants (see below table for more information.
**Default:** `us`
**Values:** `us`,`uk`,`ca`, `da`, `de`, `es`, `fr`, `it`, `pt-br` | -| `originals_only` | **Description:** Changes Streaming Service lists to only show original content produced by the service.
**Note**: Cannot be used with `region`, and only produces collections for `amazon`, `appletv`, `disney`, `hbomax`, `hulu`, `netflix`, `paramount`, `peacock`
**Default:** `false`
**Values:** `true`, `false` | -| `name_format` | **Description:** Changes the title format of the Dynamic Collections.
**Default:** `<> <>s`
**Values:** Any string with `<>` in it. | -| `summary_format` | **Description:** Changes the summary format of the Dynamic Collections.
**Default:** `<>s streaming on <>.`
**Values:** Any string. | +| Variable | Description & Values | +|:--------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `limit` | **Description:** Changes the Builder Limit for all collections in a Defaults file.
**Values:** Number Greater then 0 | +| `limit_<>`1 | **Description:** Changes the Builder Limit of the specified key's collection.
**Default:** `limit`
**Values:** Number Greater then 0 | +| `sort_by` | **Description:** Changes the Smart Filter Sort for all collections in a Defaults file.
**Default:** `release.desc`
**Values:** [Any `smart_filter` Sort Option](../../metadata/builders/smart.md#sort-options) | +| `sort_by_<>`1 | **Description:** Changes the Smart Filter Sort of the specified key's collection.
**Default:** `sort_by`
**Values:** [Any `smart_filter` Sort Option](../../metadata/builders/smart.md#sort-options) | +| `sync_mode` | **Description:** Changes the Sync Mode for all collections in a Defaults file.
**Default:** `sync`
**Values:**
`sync`Add and Remove Items based on Builders
`append`Only Add Items based on Builders
| +| `sync_mode_<>`1 | **Description:** Changes the Sync Mode of the specified key's collection.
**Default:** `sync_mode`
**Values:**
`sync`Add and Remove Items based on Builders
`append`Only Add Items based on Builders
| +| `exclude` | **Description:** Exclude these Streaming Services from creating a Dynamic Collection.
**Values:** List of Streaming Service Keys | +| `region` | **Description:** Changes some Streaming Service lists to regional variants (see below table for more information.
**Default:** `us`
**Values:** `us`,`uk`,`ca`, `da`, `de`, `es`, `fr`, `it`, `pt-br` | +| `originals_only` | **Description:** Changes Streaming Service lists to only show original content produced by the service.
**Note**: Cannot be used with `region`, and only produces collections for `amazon`, `appletv`, `disney`, `max`, `hulu`, `netflix`, `paramount`, `peacock`
**Default:** `false`
**Values:** `true`, `false` | +| `name_format` | **Description:** Changes the title format of the Dynamic Collections.
**Default:** `<> <>s`
**Values:** Any string with `<>` in it. | +| `summary_format` | **Description:** Changes the summary format of the Dynamic Collections.
**Default:** `<>s streaming on <>.`
**Values:** Any string. | 1. Each default collection has a `key` that when calling to effect a specific collection you must replace `<>` with when calling. @@ -80,7 +80,7 @@ Some logic is applied to allow for regional streaming service lists to be availa | any besides `us` | `amazon`, `disney`, `netflix` | These collections will use regional variant lists to ensure the lists populate with what is available in the region specified | | any besides `uk` | `all4`, `britbox`, `hayu`, `now` | These collections will not be created if the region is not `uk` as these streaming services are UK-focused | | any besides `ca` | `crave` | These collections will not be created if the region is not `ca` as these streaming services are Canada-focused | -| `ca` | `hbomax`, `showtime` | These collections will not be created if the region is `ca` as these streaming services are part of the Crave streaming service in Canada | +| `ca` | `max`, `showtime` | These collections will not be created if the region is `ca` as these streaming services are part of the Crave streaming service in Canada | The below is an example config.yml extract with some Template Variables added in to change how the file works. diff --git a/docs/defaults/collection_list.md b/docs/defaults/collection_list.md index 113f9519..e23254dc 100644 --- a/docs/defaults/collection_list.md +++ b/docs/defaults/collection_list.md @@ -28,7 +28,7 @@ These collections are applied by calling the below paths into the `metadata_path | [Chart Separator](chart/separator) | `separator_chart` | Chart Collections | ✅ | ✅ | | [AniList](chart/anilist) | `anilist` | AniList Popular, AniList Season | ✅ | ✅ | | [Basic](chart/basic) | `basic` | Newly Released, New Episodes | ✅ | ✅ | -| [FlixPatrol](chart/flixpatrol) | `flixpatrol` | Top Disney, Top Hbo, Top Hulu, Top Netflix | ✅ | ✅ | +| [FlixPatrol](chart/flixpatrol) | `flixpatrol` | Top Disney, Top Max, Top Hulu, Top Netflix | ✅ | ✅ | | [IMDb](chart/imdb) | `imdb` | IMDb Popular, IMDb Top 250 | ✅ | ✅ | | [MyAnimeList](chart/myanimelist) | `myanimelist` | MyAnimeList Popular, MyAnimeList Top Rated | ✅ | ✅ | | [Other](chart/other) | `other_chart` | AniDB Popular, Common Sense Selection | ✅ | ✅ | @@ -60,7 +60,7 @@ These collections are applied by calling the below paths into the `metadata_path | [Producer](movie/producer) | `producer` | James Cameron (Producer), Reese Witherspoon (Producer) | ✅ | ❌ | | [Resolution](both/resolution) | `resolution` | 4K Movies, 1080p Movies, 720p Movies | ✅ | ✅ | | [Seasonal](movie/seasonal) | `seasonal` | Easter, Christmas | ✅ | ❌ | -| [Streaming](both/streaming) | `streaming` | Disney+ Movies, Max Shows | ✅ | ✅ | +| [Streaming](both/streaming) | `streaming` | Disney+ Movies, Max Shows | ✅ | ✅ | | [Studio](both/studio) | `studio` | DreamWorks Studios, Walt Disney Pictures | ✅ | ✅ | | [Anime Studio](both/studio_anime) | `studio_anime` | Bones, Studio Ghibli, Toei Animation | ✅ | ✅ | | [Subtitle Language](both/subtitle_language) | `subtitle_language` | German Subtitles, Swedish Subtitles | ✅ | ✅ | diff --git a/docs/defaults/overlays/streaming.md b/docs/defaults/overlays/streaming.md index 3c8b0d41..005e7fbf 100644 --- a/docs/defaults/overlays/streaming.md +++ b/docs/defaults/overlays/streaming.md @@ -11,26 +11,26 @@ Supported Overlay Level: Movie, Show ## Supported Streaming Services -| Streaming Service | Key | Weight | -|:------------------|:---------------|:-------| -| Netflix | `netflix` | `160` | -| Prime Video | `amazon` | `150` | -| Disney+ | `disney` | `140` | -| Max | `hbomax` | `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` | +| 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` | ## Config @@ -66,7 +66,7 @@ All [Shared Overlay Variables](../overlay_variables) are available with the defa | `back_width` | **Description:** Change the back (lozenge) width.
**Default Value:** `305` | | `back_height` | **Description:** Change the back (lozenge) height.
**Default Value:** `105` | | `region` | **Description:** Changes some Streaming Service lists to regional variants (see below table for more information.
**Default:** `us`
**Values:** `us`,`uk`,`ca`, `da`, `de`, `es`, `fr`, `it`, `pt-br` | -| `originals_only` | **Description:** Changes Streaming Service overlays to only apply to original content produced by the service.
**Note**: Cannot be used with `region`, and only produces overlays for `amazon`, `appletv`, `disney`, `hbomax`, `hulu`, `netflix`, `paramount`, `peacock`
**Default:** `false`
**Values:** `true`, `false` | +| `originals_only` | **Description:** Changes Streaming Service overlays to only apply to original content produced by the service.
**Note**: Cannot be used with `region`, and only produces overlays for `amazon`, `appletv`, `disney`, `max`, `hulu`, `netflix`, `paramount`, `peacock`
**Default:** `false`
**Values:** `true`, `false` | | `weight_<>`1 | **Description:** Controls the weight of the Overlay. Higher numbers have priority.
**Values:** Any Number | 1. Each default overlay has a `key` that when calling to effect a specific overlay you must replace `<>` with when calling. @@ -80,7 +80,7 @@ Some logic is applied to allow for regional streaming service lists to be availa | any besides `us` | `amazon`, `disney`, `netflix` | These overlays will use regional variant lists to ensure the overlays are applied to what is available in the region specified | | any besides `uk` | `all4`, `britbox`, `hayu`, `now` | These overlays will not be used if the region is not `uk` as these streaming services are UK-focused | | any besides `ca` | `crave` | These overlays will not be used if the region is not `ca` as these streaming services are Canada-focused | -| `ca` | `hbomax`, `showtime` | These overlays will not be used if the region is `ca` as these streaming services are part of the Crave streaming service in Canada | +| `ca` | `max`, `showtime` | These overlays will not be used if the region is `ca` as these streaming services are part of the Crave streaming service in Canada | The below is an example config.yml extract with some Template Variables added in to change how the file works. diff --git a/docs/defaults/separators.md b/docs/defaults/separators.md index 72e8f0b1..d61544e8 100644 --- a/docs/defaults/separators.md +++ b/docs/defaults/separators.md @@ -35,7 +35,7 @@ These are all the files that contain a separator | Writers Collections | `writer` | | Based On... Collections | `based` | -## Shared Separator Variables +## Shared Separator Variables Template Variables can be used to manipulate the file in various ways to slightly change how it works without having to make your own local copy. diff --git a/docs/metadata/dynamic.md b/docs/metadata/dynamic.md index 16b7aad4..6bec638d 100644 --- a/docs/metadata/dynamic.md +++ b/docs/metadata/dynamic.md @@ -2083,7 +2083,7 @@ dynamic_collections: bet: BET+ britbox: BritBox disney: Disney+ - hbo-max: Max + max: Max hulu: Hulu netflix: Netflix now: NOW