From a81c473b1f3db0543e1d215a4d98d3893079e7ed Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Thu, 27 Oct 2022 02:39:30 -0400 Subject: [PATCH] [165] update queues --- VERSION | 2 +- defaults/overlays/flixpatrol.yml | 35 ++-- .../images/{Dual-Audio.png => dual_audio.png} | Bin defaults/overlays/images/dual_subs.png | Bin 0 -> 3188 bytes .../{Multi-Audio.png => multi_audio.png} | Bin defaults/overlays/images/multi_subs.png | Bin 0 -> 3056 bytes defaults/overlays/language_count.yml | 24 ++- .../overlays/{language.yml => languages.yml} | 81 ++++----- docs/conf.py | 3 +- docs/defaults/both/actor.md | 2 +- docs/defaults/both/resolution.md | 2 +- docs/defaults/movie/country.md | 2 +- docs/defaults/movie/director.md | 2 +- docs/defaults/movie/producer.md | 2 +- docs/defaults/movie/writer.md | 2 +- docs/defaults/overlays/language_count.md | 40 ++--- docs/defaults/overlays/languages.md | 160 +++++++++++++++++- docs/defaults/show/country.md | 2 +- modules/meta.py | 43 ++++- modules/overlay.py | 4 +- modules/util.py | 6 +- 21 files changed, 291 insertions(+), 121 deletions(-) rename defaults/overlays/images/{Dual-Audio.png => dual_audio.png} (100%) create mode 100644 defaults/overlays/images/dual_subs.png rename defaults/overlays/images/{Multi-Audio.png => multi_audio.png} (100%) create mode 100644 defaults/overlays/images/multi_subs.png rename defaults/overlays/{language.yml => languages.yml} (85%) diff --git a/VERSION b/VERSION index a509e58d..fbbe3674 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop164 +1.17.3-develop165 diff --git a/defaults/overlays/flixpatrol.yml b/defaults/overlays/flixpatrol.yml index 87660bf8..98ce9aea 100644 --- a/defaults/overlays/flixpatrol.yml +++ b/defaults/overlays/flixpatrol.yml @@ -25,32 +25,19 @@ external_templates: queues: position: + default: + horizontal_offset: 30 + horizontal_align: right + vertical_offset: 465 + vertical_align: top right: - - horizontal_offset: 30 - horizontal_align: right - vertical_offset: 465 - vertical_align: top - - horizontal_offset: 30 - horizontal_align: right - vertical_offset: 670 - vertical_align: top - - horizontal_offset: 30 - horizontal_align: right - vertical_offset: 875 - vertical_align: top + - + - vertical_offset: 670 + - vertical_offset: 875 left: - - horizontal_offset: 30 - horizontal_align: left - vertical_offset: 465 - vertical_align: top - - horizontal_offset: 30 - horizontal_align: left - vertical_offset: 670 - vertical_align: top - - horizontal_offset: 30 - horizontal_align: left - vertical_offset: 875 - vertical_align: top + - horizontal_align: left + - vertical_offset: 670 + - vertical_offset: 875 templates: flixpatrol: diff --git a/defaults/overlays/images/Dual-Audio.png b/defaults/overlays/images/dual_audio.png similarity index 100% rename from defaults/overlays/images/Dual-Audio.png rename to defaults/overlays/images/dual_audio.png diff --git a/defaults/overlays/images/dual_subs.png b/defaults/overlays/images/dual_subs.png new file mode 100644 index 0000000000000000000000000000000000000000..cbddf1407d2330ac865766e5f84e873ce5195168 GIT binary patch literal 3188 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 + pmm: <>_<> templates: language: + conditionals: + search_attribute: + default: audio_language + conditions: + - use_subtitles: true + value: subtitle_language default: minimum: 2 optional: @@ -28,15 +40,15 @@ templates: ignore_blank_results: true plex_all: true filters: - audio_language.count_gte: <> - audio_language.count_lt: <> + <>.count_gte: <> + <>.count_lt: <> overlays: - Dual-Audio: + Dual: variables: {key: dual, weight: 20, lt: 3} template: [name: standard, name: language] - Multi-Audio: + Multi: variables: {key: multi, weight: 10} template: [name: standard, name: language] diff --git a/defaults/overlays/language.yml b/defaults/overlays/languages.yml similarity index 85% rename from defaults/overlays/language.yml rename to defaults/overlays/languages.yml index 25bdeeb3..3332f213 100644 --- a/defaults/overlays/language.yml +++ b/defaults/overlays/languages.yml @@ -1,5 +1,5 @@ ############################################################################## -# Languages Overlays # +# Audio/Subtitle Language Flags Overlays # # Created by Yozora, Bullmoose20, Cpt Kuesel, & Sohjiro # # EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # # https://metamanager.wiki/en/latest/defaults/overlays/languages.html # @@ -8,64 +8,57 @@ external_templates: pmm: templates template_variables: + conditionals: + final_text: + default: <> + conditions: + - use_lowercase: true + value: <> + final_style: + default: round + conditions: + - style: [square, half] + value: square + back_radius: + conditions: + - style: [round, half] + value: 26 + - style: square + value: style: round country: <> queue: position - pmm: flag/<