diff --git a/CHANGELOG b/CHANGELOG index 8eef055e..01537656 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -32,13 +32,13 @@ Removed Translations from the defaults directory and in to their own [repo](http Added `minimum_rating`, `fresh_rating`, and `maximum_rating` as template variable options to the [Ratings Overlays](https://metamanager.wiki/en/latest/defaults/overlays/ratings.html) to control which ratings get displayed. Added the ability to update Overlay Defaults Positioning with just setting the alignment variables. Added [Based On...](https://metamanager.wiki/en/latest/defaults/both/based.html) Collection Default. -Added Signature Style, DIIIVOY Style, and DIIVOY Color Style to [`actor`](https://metamanager.wiki/en/latest/defaults/both/actor.html), [`directors`](https://metamanager.wiki/en/latest/defaults/movie/director.html), [`producers`](https://metamanager.wiki/en/latest/defaults/movie/producer.html), and [`writers`](https://metamanager.wiki/en/latest/defaults/movie/writer.html). +Added Signature Style, DIIIVOY Style, and DIIIVOY Color Style to [`actor`](https://metamanager.wiki/en/latest/defaults/both/actor.html), [`directors`](https://metamanager.wiki/en/latest/defaults/movie/director.html), [`producers`](https://metamanager.wiki/en/latest/defaults/movie/producer.html), and [`writers`](https://metamanager.wiki/en/latest/defaults/movie/writer.html). Added new editions to the [editions Overlay File](https://metamanager.wiki/en/latest/defaults/overlays/resolution.html). Added `delete_playlist` and `delete_playlist_<>` as template variable options to the [Playlist Default](https://metamanager.wiki/en/latest/defaults/playlist.html). Added `region` as a template variable options to the [`streaming` Overlay](https://metamanager.wiki/en/latest/defaults/overlays/streaming.html) and [`streaming` Collection](https://metamanager.wiki/en/latest/defaults/both/streaming.html) to allow these lists to show items in that region. Added AppleTV to te [FlixPatrol Default](https://metamanager.wiki/en/latest/defaults/overlays/flixpatrol.html). Added `radarr_search` and `sonarr_search` as template variable options to all Collection Defaults. -Updated `network` and `franchise` defaults +Updated `network` and `franchise` defaults. Added `include` as a template variable options to the people collections ([`actor`](https://metamanager.wiki/en/latest/defaults/both/actor.html), [`director`](https://metamanager.wiki/en/latest/defaults/movie/director.html), [`producer`](https://metamanager.wiki/en/latest/defaults/movie/producer.html), [`writer`](https://metamanager.wiki/en/latest/defaults/movie/writer.html)) to specifically include the list of actors. # Bug Fixes diff --git a/VERSION b/VERSION index a0ffff8d..96523e8b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop173 +1.18.3-develop174 diff --git a/defaults/award/bafta.yml b/defaults/award/bafta.yml index f680f105..537467ee 100644 --- a/defaults/award/bafta.yml +++ b/defaults/award/bafta.yml @@ -48,3 +48,5 @@ dynamic_collections: default: award/bafta/<> translation_key: default: bafta_year + dynamic: + default: true diff --git a/defaults/award/cannes.yml b/defaults/award/cannes.yml index 308e573d..1fbc2642 100644 --- a/defaults/award/cannes.yml +++ b/defaults/award/cannes.yml @@ -48,3 +48,5 @@ dynamic_collections: default: award/cannes/<> translation_key: default: cannes_year + dynamic: + default: true diff --git a/defaults/award/choice.yml b/defaults/award/choice.yml index e3a54503..b8fa1dc1 100644 --- a/defaults/award/choice.yml +++ b/defaults/award/choice.yml @@ -40,3 +40,5 @@ dynamic_collections: 2016: critics 2015: critics 2014: critics + dynamic: + default: true \ No newline at end of file diff --git a/defaults/award/emmy.yml b/defaults/award/emmy.yml index acf3fb48..03c91b41 100644 --- a/defaults/award/emmy.yml +++ b/defaults/award/emmy.yml @@ -33,3 +33,5 @@ dynamic_collections: default: award/emmys/winner/<> translation_key: default: emmy_year + dynamic: + default: true diff --git a/defaults/award/golden.yml b/defaults/award/golden.yml index 4ae38c32..0a71fd6d 100644 --- a/defaults/award/golden.yml +++ b/defaults/award/golden.yml @@ -67,3 +67,5 @@ dynamic_collections: default: award/golden/winner/<> translation_key: default: golden_year + dynamic: + default: true diff --git a/defaults/award/oscars.yml b/defaults/award/oscars.yml index de71c20e..014c86e6 100644 --- a/defaults/award/oscars.yml +++ b/defaults/award/oscars.yml @@ -62,3 +62,5 @@ dynamic_collections: default: award/oscars/winner/<> translation_key: default: oscars_year + dynamic: + default: true diff --git a/defaults/award/spirit.yml b/defaults/award/spirit.yml index f8088940..4b1bd96f 100644 --- a/defaults/award/spirit.yml +++ b/defaults/award/spirit.yml @@ -34,3 +34,5 @@ dynamic_collections: default: award/spirit/<> translation_key: default: spirit_year + dynamic: + default: true diff --git a/defaults/award/sundance.yml b/defaults/award/sundance.yml index 34a6f115..71477049 100644 --- a/defaults/award/sundance.yml +++ b/defaults/award/sundance.yml @@ -48,3 +48,5 @@ dynamic_collections: default: award/sundance/<> translation_key: default: sundance_year + dynamic: + default: true diff --git a/defaults/both/actor.yml b/defaults/both/actor.yml index c9805632..322fe25d 100644 --- a/defaults/both/actor.yml +++ b/defaults/both/actor.yml @@ -42,3 +42,5 @@ dynamic_collections: default: actor style: default: bw + dynamic: + default: true diff --git a/defaults/both/audio_language.yml b/defaults/both/audio_language.yml index 57c5aa46..9ec5c553 100644 --- a/defaults/both/audio_language.yml +++ b/defaults/both/audio_language.yml @@ -38,6 +38,8 @@ dynamic_collections: translation_key: default: audio_language other: audio_language_other + dynamic: + default: true include: - ab # Abkhazian - aa # Afar diff --git a/defaults/both/based.yml b/defaults/both/based.yml index 5df92fa8..3ad05497 100644 --- a/defaults/both/based.yml +++ b/defaults/both/based.yml @@ -37,4 +37,6 @@ dynamic_collections: image: default: based/<> translation_key: - default: based \ No newline at end of file + default: based + dynamic: + default: true \ No newline at end of file diff --git a/defaults/both/content_rating_cs.yml b/defaults/both/content_rating_cs.yml index caac9d17..6af14cbc 100644 --- a/defaults/both/content_rating_cs.yml +++ b/defaults/both/content_rating_cs.yml @@ -58,6 +58,8 @@ dynamic_collections: 16: "16_" 17: "17_" 18: "18_" + dynamic: + default: true include: - 1 - 2 diff --git a/defaults/both/content_rating_mal.yml b/defaults/both/content_rating_mal.yml index 10af7e06..165460d4 100644 --- a/defaults/both/content_rating_mal.yml +++ b/defaults/both/content_rating_mal.yml @@ -39,6 +39,8 @@ dynamic_collections: translation_key: default: content_rating other: content_rating_other + dynamic: + default: true include: - "G" - "PG" diff --git a/defaults/both/content_rating_uk.yml b/defaults/both/content_rating_uk.yml index 647fa9b9..de099827 100644 --- a/defaults/both/content_rating_uk.yml +++ b/defaults/both/content_rating_uk.yml @@ -39,6 +39,8 @@ dynamic_collections: translation_key: default: content_rating other: content_rating_other + dynamic: + default: true include: - U - PG diff --git a/defaults/both/genre.yml b/defaults/both/genre.yml index 438d854f..c09b0605 100644 --- a/defaults/both/genre.yml +++ b/defaults/both/genre.yml @@ -32,6 +32,8 @@ dynamic_collections: default: genre/<> translation_key: default: genre + dynamic: + default: true addons: Action: - Action/Adventure diff --git a/defaults/both/resolution.yml b/defaults/both/resolution.yml index f06b6ef5..ec0d2250 100644 --- a/defaults/both/resolution.yml +++ b/defaults/both/resolution.yml @@ -61,6 +61,8 @@ dynamic_collections: 1080: 2_ 720: 3_ 480: 4_ + dynamic: + default: true include: - 4k - 1080 diff --git a/defaults/both/streaming.yml b/defaults/both/streaming.yml index 25964910..29ddfe18 100644 --- a/defaults/both/streaming.yml +++ b/defaults/both/streaming.yml @@ -110,4 +110,6 @@ dynamic_collections: discovery: show crunchyroll: show translation_key: - default: streaming \ No newline at end of file + default: streaming + dynamic: + default: true \ No newline at end of file diff --git a/defaults/both/studio.yml b/defaults/both/studio.yml index 5a8a4ee2..e2447a68 100644 --- a/defaults/both/studio.yml +++ b/defaults/both/studio.yml @@ -36,6 +36,8 @@ dynamic_collections: default: studio/<> translation_key: default: studio + dynamic: + default: true include: - 20th Century Studios - Amazon Studios diff --git a/defaults/both/studio_anime.yml b/defaults/both/studio_anime.yml index 85e8fab3..7305d491 100644 --- a/defaults/both/studio_anime.yml +++ b/defaults/both/studio_anime.yml @@ -32,6 +32,8 @@ dynamic_collections: default: studio/<> translation_key: default: studio + dynamic: + default: true include: - 8bit - A-1 Pictures diff --git a/defaults/both/subtitle_language.yml b/defaults/both/subtitle_language.yml index eb52792d..7afdb6b0 100644 --- a/defaults/both/subtitle_language.yml +++ b/defaults/both/subtitle_language.yml @@ -38,6 +38,8 @@ dynamic_collections: translation_key: default: subtitle_language other: subtitle_language_other + dynamic: + default: true include: - ab # Abkhazian - aa # Afar diff --git a/defaults/both/year.yml b/defaults/both/year.yml index ab6e0c65..7aaa37e0 100644 --- a/defaults/both/year.yml +++ b/defaults/both/year.yml @@ -40,3 +40,5 @@ dynamic_collections: default: year/best/<> translation_key: default: year + dynamic: + default: true diff --git a/defaults/chart/flixpatrol.yml b/defaults/chart/flixpatrol.yml index c62b1b40..7f900896 100644 --- a/defaults/chart/flixpatrol.yml +++ b/defaults/chart/flixpatrol.yml @@ -62,3 +62,5 @@ dynamic_collections: default: chart/<>_top translation_key: default: flixpatrol + dynamic: + default: true diff --git a/defaults/movie/content_rating_us.yml b/defaults/movie/content_rating_us.yml index da9823dd..a93ecd40 100644 --- a/defaults/movie/content_rating_us.yml +++ b/defaults/movie/content_rating_us.yml @@ -39,6 +39,8 @@ dynamic_collections: translation_key: default: content_rating other: content_rating_other + dynamic: + default: true include: - G - PG diff --git a/defaults/movie/country.yml b/defaults/movie/country.yml index 536b1586..64584dc1 100644 --- a/defaults/movie/country.yml +++ b/defaults/movie/country.yml @@ -42,6 +42,8 @@ dynamic_collections: translation_key: default: country other: country_other + dynamic: + default: true include: # - Afghanistan # af # - Åland Islands # ax diff --git a/defaults/movie/decade.yml b/defaults/movie/decade.yml index dbf9895a..98a1fc89 100644 --- a/defaults/movie/decade.yml +++ b/defaults/movie/decade.yml @@ -35,4 +35,6 @@ dynamic_collections: image: default: decade/best/<> translation_key: - default: decade \ No newline at end of file + default: decade + dynamic: + default: true \ No newline at end of file diff --git a/defaults/movie/director.yml b/defaults/movie/director.yml index 3289aa92..c9f55ce5 100644 --- a/defaults/movie/director.yml +++ b/defaults/movie/director.yml @@ -43,3 +43,5 @@ dynamic_collections: default: director style: default: bw + dynamic: + default: true diff --git a/defaults/movie/producer.yml b/defaults/movie/producer.yml index d4d3c2ba..54f4735c 100644 --- a/defaults/movie/producer.yml +++ b/defaults/movie/producer.yml @@ -42,3 +42,5 @@ dynamic_collections: default: producer style: default: bw + dynamic: + default: true diff --git a/defaults/movie/writer.yml b/defaults/movie/writer.yml index 27460697..0a21e95b 100644 --- a/defaults/movie/writer.yml +++ b/defaults/movie/writer.yml @@ -43,3 +43,5 @@ dynamic_collections: default: writer style: default: bw + dynamic: + default: true diff --git a/defaults/show/content_rating_us.yml b/defaults/show/content_rating_us.yml index c610067a..bd941603 100644 --- a/defaults/show/content_rating_us.yml +++ b/defaults/show/content_rating_us.yml @@ -39,6 +39,8 @@ dynamic_collections: translation_key: default: content_rating other: content_rating_other + dynamic: + default: true include: - TV-G - TV-Y diff --git a/defaults/show/country.yml b/defaults/show/country.yml index 1c5e2015..caef33f5 100644 --- a/defaults/show/country.yml +++ b/defaults/show/country.yml @@ -41,6 +41,8 @@ dynamic_collections: translation_key: default: country other: country_other + dynamic: + default: true include: # - af # Afghanistan # - ax # Åland Islands diff --git a/defaults/show/decade.yml b/defaults/show/decade.yml index e0457bf7..06853b6f 100644 --- a/defaults/show/decade.yml +++ b/defaults/show/decade.yml @@ -35,4 +35,6 @@ dynamic_collections: image: default: decade/best/<> translation_key: - default: decade \ No newline at end of file + default: decade + dynamic: + default: true \ No newline at end of file diff --git a/defaults/show/network.yml b/defaults/show/network.yml index 0a88328b..3ab95e16 100644 --- a/defaults/show/network.yml +++ b/defaults/show/network.yml @@ -32,6 +32,8 @@ dynamic_collections: default: network/<> translation_key: default: network + dynamic: + default: true include: # TMDB Most Common & Most Watched Network Rankings - ABC # American Broadcasting Company diff --git a/defaults/templates.yml b/defaults/templates.yml index f73c4a10..6a77887b 100644 --- a/defaults/templates.yml +++ b/defaults/templates.yml @@ -41,6 +41,15 @@ templates: name: <>>> shared: + conditionals: + name_<>: + conditions: + - dynamic: true + value: <> + summary_<>: + conditions: + - dynamic: true + value: <> default: collection_section: "00" key: <> @@ -55,8 +64,6 @@ templates: visible_home_<>: <> visible_shared_<>: <> minimum_items_<>: <> - summary_<>: <> - name_<>: <> optional: - use_<> - allowed_libraries diff --git a/docs/home/environmental.md b/docs/home/environmental.md index 100f4070..0562b75b 100644 --- a/docs/home/environmental.md +++ b/docs/home/environmental.md @@ -40,7 +40,7 @@ Environment Variables can also be placed inside a `.env` file inside your config | [ENV Plex Token](#env-plex-url--token) | `-pt` or `--plex-token` | `PMM_PLEX_TOKEN` | | [Divider Character](#divider-character--screen-width) | `-d` or `--divider` | `PMM_DIVIDER` | | [Screen Width](#divider-character--screen-width) | `-w` or `--width` | `PMM_WIDTH` | -| [Other Secrets](#config-secrets) | `--pmm-***` | `PMM_***` | +| [Config Secrets](#config-secrets) | `--pmm-***` | `PMM_***` | Further explanation and examples of each command can be found below.