[34] Merge remote-tracking branch 'yozora/nightly' into nightly

defaults/both/streaming.yml

@@ -21,12 +21,12 @@ templates:
         default: <<library_type>>
         conditions:
           - originals_only: true
-            key: [appletv, disney, hbomax, hulu, netflix, paramount, peacock]
+            key: [appletv, disney, hbomax, hulu, netflix, paramount, peacock, amazon]
             value: "original"
       allowed_streaming:
         conditions:
           - originals_only: true
-            key: [all4, bet, britbox, crave, crunchyroll, discovery, hayu, now, amazon, showtime]
+            key: [all4, bet, britbox, crave, crunchyroll, discovery, hayu, now, showtime]
             value: False
           - region.not: uk
             key: [all4, britbox, hayu, now]

defaults/overlays/streaming.yml

@@ -9,6 +9,8 @@
 external_templates:
   pmm: templates
   template_variables:
+    originals_only:
+      default: false
     run_definition:
       - <<use_<<key>>>>
       - <<use_<<alt>>>>
@@ -52,10 +54,19 @@ templates:
     run_definition:
       - <<allowed_streaming>>
     ignore_blank_results: true
-    mdblist_list: https://mdblist.com/lists/plexmetamanager/<<key>>-<<library_type>>s<<watch_region>>
+    mdblist_list: https://mdblist.com/lists/plexmetamanager/<<key>>-<<url_part>>s<<watch_region>>
     conditionals:
+      url_part:
+        default: <<library_type>>
+        conditions:
+          - originals_only: true
+            key: [appletv, disney, hbomax, hulu, netflix, paramount, peacock, amazon]
+            value: "original"
       allowed_streaming:
         conditions:
+          - originals_only: true
+            key: [all4, bet, britbox, crave, crunchyroll, discovery, hayu, now, showtime]
+            value: False
           - region.not: uk
             key: [all4, britbox, hayu, now]
             value: False
@@ -68,6 +79,8 @@ templates:
       watch_region:
         default: ""
         conditions:
+          - originals_only: true
+            value: ""
           - region: ca
             key: [amazon, disney, netflix]
             value: "-ca"

docs/defaults/both/streaming.md

@@ -56,7 +56,7 @@ 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.<br>**Values:** Number Greater then 0                                                                                                                                                                                                             |
 | `limit_<<key>>`<sup>1</sup>     | **Description:** Changes the Builder Limit of the specified key's collection.<br>**Default:** `limit`<br>**Values:** Number Greater then 0                                                                                                                                                                                          |
 | `sort_by`                       | **Description:** Changes the Smart Filter Sort for all collections in a Defaults file.<br>**Default:** `release.desc`<br>**Values:** [Any `smart_filter` Sort Option](../../metadata/builders/smart.md#sort-options)                                                                                                                |
@@ -65,7 +65,7 @@ This file contains a [Separator](../separators) so all [Shared Separator Variabl
 | `sync_mode_<<key>>`<sup>1</sup> | **Description:** Changes the Sync Mode of the specified key's collection.<br>**Default:** `sync_mode`<br>**Values:**<table class="clearTable"><tr><td>`sync`</td><td>Add and Remove Items based on Builders</td></tr><tr><td>`append`</td><td>Only Add Items based on Builders</td></tr></table>                                    |
 | `exclude`                       | **Description:** Exclude these Streaming Services from creating a Dynamic Collection.<br>**Values:** List of Streaming Service Keys                                                                                                                                                                                                 |
 | `region`                        | **Description:** Changes some Streaming Service lists to regional variants (see below table for more information.<br>**Default:** `us`<br>**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.<br>**Note**: Cannot be used with `region`, and only produces collections for `appletv`, `disney`, `hbomax`, `hulu`, `netflix`, `paramount`, `peacock`<br>**Default:** `false`<br>**Values:** `true`, `false`  |
+| `originals_only`                | **Description:** Changes  Streaming Service lists to only show original content produced by the service.<br>**Note**: Cannot be used with `region`, and only produces collections for `appletv`, `disney`, `hbomax`, `hulu`, `netflix`, `paramount`, `peacock` and `amazon`<br>**Default:** `false`<br>**Values:** `true`, `false`  |
 | `name_format`                   | **Description:** Changes the title format of the Dynamic Collections.<br>**Default:** `<<key_name>> <<library_translationU>>s`<br>**Values:** Any string with `<<key_name>>` in it.                                                                                                                                                 |
 | `summary_format`                | **Description:** Changes the summary format of the Dynamic Collections.<br>**Default:** `<<library_translationU>>s streaming on <<key_name>>.`<br>**Values:** Any string.                                                                                                                                                           |