From 3c46ae37f7ee5c07bab3bf670d198dc112b4ffe4 Mon Sep 17 00:00:00 2001 From: bullmoose20 Date: Tue, 20 Sep 2022 02:59:01 -0400 Subject: [PATCH] additional tweaks and overlays (#453) --- PMM/movie/seasonal.yml | 4 +- PMM/overlays/age.yml | 35 ++++++++++++++---- PMM/overlays/audio_codec.yml | 16 ++++++-- PMM/overlays/episode_info.yml | 47 +++++++++++++++++------- PMM/overlays/mediastinger.yml | 20 ++++++++-- PMM/overlays/runtimes.yml | 35 ++++++++++++++---- PMM/overlays/streaming.yml | 20 ++++++++-- PMM/overlays/versions.yml | 69 +++++++++++++++++++++++++++++++++++ PMM/overlays/video_format.yml | 35 ++++++++++++++---- bullmoose20/config.yml | 43 ++++++++++++++++------ 10 files changed, 265 insertions(+), 59 deletions(-) create mode 100644 PMM/overlays/versions.yml diff --git a/PMM/movie/seasonal.yml b/PMM/movie/seasonal.yml index 8bcbdf7..6cad14a 100644 --- a/PMM/movie/seasonal.yml +++ b/PMM/movie/seasonal.yml @@ -16,7 +16,7 @@ # # Turn the Independence Day collection on/off # # schedule_independence: range(06/23-07/11) # # # Turn the Easter collection on/off # -# schedule_easter: range(03/22-04/25) # +# schedule_easter: range(03/15-04/30) # # # Turn the Valentine's Day collection on/off # # schedule_valentine: range(02/01-02/29) # # # Turn the St. Patrick's Day collection on/off # @@ -78,7 +78,7 @@ collections: template: - name: Holiday season: easter - schedule_easter: range(03/22-04/25) + schedule_easter: range(03/15-04/30) - name: shared imdb_list: - https://www.imdb.com/list/ls062665509/ diff --git a/PMM/overlays/age.yml b/PMM/overlays/age.yml index 452f889..d00f993 100644 --- a/PMM/overlays/age.yml +++ b/PMM/overlays/age.yml @@ -20,6 +20,20 @@ # vertical_offset: 270 # # # Set the vertical align for the overlay # # vertical_align: bottom # +# # Set the font for the overlay # +# font: fonts/Inter-Medium.ttf # +# # Set the font size for the overlay # +# font_size: 55 # +# # Set the font color for the overlay # +# font_color: "#FFFFFF" # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 300 # +# # Set the back height for the overlay # +# back_height: 105 # # # # # Use the NR overlay # # use_nr: true # @@ -45,6 +59,13 @@ templates: horizontal_align: left vertical_offset: 270 vertical_align: bottom + font: fonts/Inter-Medium.ttf + font_size: 55 + font_color: "#FFFFFF" + back_color: "#00000099" + back_radius: 30 + back_width: 300 + back_height: 105 collection_level: <> allowed_library_types: <>>> ignore_blank_results: true @@ -54,13 +75,13 @@ templates: horizontal_align: <> vertical_offset: <> vertical_align: <> - font: fonts/Inter-Medium.ttf - font_size: 55 - font_color: "#FFFFFF" - back_color: "#00000099" - back_radius: 30 - back_width: 300 - back_height: 105 + font: <> + font_size: <> + font_color: <> + back_color: <> + back_radius: <> + back_width: <> + back_height: <> git: PMM/overlays/images/raw/commonsense addon_position: left addon_offset: 15 diff --git a/PMM/overlays/audio_codec.yml b/PMM/overlays/audio_codec.yml index 301fef5..1f8fee2 100644 --- a/PMM/overlays/audio_codec.yml +++ b/PMM/overlays/audio_codec.yml @@ -22,8 +22,15 @@ # vertical_offset: 15 # # # Set the vertical align for the overlay # # vertical_align: top # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 300 # # # Sets the style of overlay: standard or compact # # style: compact # +# # # # Use the Opus overlay # # use_opus: true # # # Use the MP3 overlay # @@ -71,6 +78,9 @@ templates: vertical_align: top style: compact standard_value: 105 + back_color: "#00000099" + back_radius: 30 + back_width: 305 conditionals: height: default: 105 @@ -89,9 +99,9 @@ templates: horizontal_align: <> vertical_offset: <> vertical_align: <> - back_color: "#00000099" - back_radius: 30 - back_width: 305 + back_color: <> + back_radius: <> + back_width: <> back_height: <> overlays: diff --git a/PMM/overlays/episode_info.yml b/PMM/overlays/episode_info.yml index b29d580..938efc7 100644 --- a/PMM/overlays/episode_info.yml +++ b/PMM/overlays/episode_info.yml @@ -10,13 +10,27 @@ # # Set episode or season to overlay # # overlay_level: # # # Set the horizontal offset for the overlay # -# horizontal_offset: 0 # +# horizontal_offset: 15 # # # Set the horizontal align for the overlay # -# horizontal_align: center # +# horizontal_align: right # # # Set the vertical offset for the overlay # -# vertical_offset: 30 # +# vertical_offset: 150 # # # Set the vertical align for the overlay # # vertical_align: bottom # +# # Set the font for the overlay # +# font: fonts/Inter-Medium.ttf # +# # Set the font size for the overlay # +# font_size: 55 # +# # Set the font color for the overlay # +# font_color: "#FFFFFF" # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 300 # +# # Set the back height for the overlay # +# back_height: 105 # ############################################################# templates: @@ -25,10 +39,17 @@ templates: - overlay_level default: overlay: <> - horizontal_offset: 0 - horizontal_align: center - vertical_offset: 30 + horizontal_offset: 15 + horizontal_align: right + vertical_offset: 150 vertical_align: bottom + font: fonts/Inter-Medium.ttf + font_size: 55 + font_color: "#FFFFFF" + back_color: "#00000099" + back_radius: 30 + back_width: 300 + back_height: 105 collection_level: <> overlay: name: text(S<>E<>) @@ -36,13 +57,13 @@ templates: horizontal_align: <> vertical_offset: <> vertical_align: <> - font: fonts/Inter-Medium.ttf - font_size: 63 - font_color: "#FFFFFF" - back_color: "#00000099" - back_radius: 30 - back_width: 300 - back_height: 105 + font: <> + font_size: <> + font_color: <> + back_color: <> + back_radius: <> + back_width: <> + back_height: <> overlays: episode_info: diff --git a/PMM/overlays/mediastinger.yml b/PMM/overlays/mediastinger.yml index e5cc788..733d4d7 100644 --- a/PMM/overlays/mediastinger.yml +++ b/PMM/overlays/mediastinger.yml @@ -17,6 +17,14 @@ # vertical_offset: 15 # # # Set the vertical align for the overlay # # vertical_align: top # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 105 # +# # Set the back height for the overlay # +# back_height: 105 # ############################################################# templates: @@ -29,18 +37,22 @@ templates: horizontal_align: right vertical_offset: 15 vertical_align: top + back_color: "#00000099" + back_radius: 30 + back_width: 105 + back_height: 105 collection_level: <> overlay: name: <> git: PMM/overlays/images/raw/<> - back_color: "#00000099" horizontal_offset: <> horizontal_align: <> vertical_offset: <> vertical_align: <> - back_radius: 30 - back_width: 105 - back_height: 105 + back_color: <> + back_radius: <> + back_width: <> + back_height: <> overlays: Mediastinger: diff --git a/PMM/overlays/runtimes.yml b/PMM/overlays/runtimes.yml index 1d5ce22..7748b27 100644 --- a/PMM/overlays/runtimes.yml +++ b/PMM/overlays/runtimes.yml @@ -17,6 +17,20 @@ # vertical_offset: 30 # # # Set the vertical align for the overlay # # vertical_align: bottom # +# # Set the font for the overlay # +# font: fonts/Inter-Medium.ttf # +# # Set the font size for the overlay # +# font_size: 55 # +# # Set the font color for the overlay # +# font_color: "#FFFFFF" # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 600 # +# # Set the back height for the overlay # +# back_height: 105 # ############################################################# templates: @@ -29,6 +43,13 @@ templates: horizontal_align: right vertical_offset: 30 vertical_align: bottom + font: fonts/Inter-Medium.ttf + font_size: 55 + font_color: "#FFFFFF" + back_color: "#00000099" + back_radius: 30 + back_width: 600 + back_height: 105 collection_level: <> overlay: name: "text(Runtime: <>h <>m)" @@ -36,13 +57,13 @@ templates: horizontal_align: <> vertical_offset: <> vertical_align: <> - font: fonts/Inter-Medium.ttf - font_size: 63 - font_color: "#FFFFFF" - back_color: "#00000099" - back_radius: 30 - back_width: 600 - back_height: 105 + font: <> + font_size: <> + font_color: <> + back_color: <> + back_radius: <> + back_width: <> + back_height: <> overlays: runtime_info: diff --git a/PMM/overlays/streaming.yml b/PMM/overlays/streaming.yml index fe3648c..f74daa3 100644 --- a/PMM/overlays/streaming.yml +++ b/PMM/overlays/streaming.yml @@ -17,6 +17,14 @@ # vertical_offset: 150 # # # Set the vertical align for the overlay # # vertical_align: bottom # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 305 # +# # Set the back height for the overlay # +# back_height: 105 # # # # # Use the Amazon overlay # # use_amazon: true # @@ -49,6 +57,10 @@ templates: horizontal_align: left vertical_offset: 150 vertical_align: bottom + back_color: "#00000099" + back_radius: 30 + back_width: 305 + back_height: 105 allowed_library_types: <>>> ignore_blank_results: true overlay: @@ -60,10 +72,10 @@ templates: horizontal_align: <> vertical_offset: <> vertical_align: <> - back_color: "#00000099" - back_radius: 30 - back_width: 305 - back_height: 105 + back_color: <> + back_radius: <> + back_width: <> + back_height: <> mdblist_list: https://mdblist.com/lists/plexmetamanager/<>-<>s overlays: diff --git a/PMM/overlays/versions.yml b/PMM/overlays/versions.yml new file mode 100644 index 0000000..c1b08b0 --- /dev/null +++ b/PMM/overlays/versions.yml @@ -0,0 +1,69 @@ +############################################################# +# Versions Overlay # +# Created by Yozora, Bullmoose20, & Sohjiro # +# Credit to Magic815 for base images # +############################################################# +# Call this from your config.yml (Movie or Show): # +# overlay_path: # +# - git: PMM/overlays/versions # +# template_variables: # +# # Set episode or season or show to overlay # +# overlay_level: # +# # Set the horizontal offset for the overlay # +# horizontal_offset: 15 # +# # Set the horizontal align for the overlay # +# horizontal_align: right # +# # Set the vertical offset for the overlay # +# vertical_offset: 390 # +# # Set the vertical align for the overlay # +# vertical_align: bottom # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 105 # +# # Set the back height for the overlay # +# back_height: 105 # +############################################################# + +templates: + Versions: + conditionals: + version_style: + default: "duplicate" + conditions: + - overlay_level: ['show', 'season', 'episode'] + value: "episode_duplicate" + plex_search: + all: + <>: true + optional: + - overlay_level + default: + horizontal_offset: 15 + horizontal_align: left + vertical_offset: 390 + vertical_align: bottom + back_color: "#00000099" + back_radius: 30 + back_width: 105 + back_height: 105 + collection_level: <> + ignore_blank_results: true + overlay: + name: versions + horizontal_offset: <> + horizontal_align: <> + vertical_offset: <> + vertical_align: <> + back_color: <> + back_radius: <> + back_width: <> + back_height: <> + git: PMM/overlays/images/raw/versions + +overlays: + Duplicate Versions: + template: + - name: Versions \ No newline at end of file diff --git a/PMM/overlays/video_format.yml b/PMM/overlays/video_format.yml index f827b64..088bf20 100644 --- a/PMM/overlays/video_format.yml +++ b/PMM/overlays/video_format.yml @@ -22,6 +22,20 @@ # vertical_offset: 30 # # # Set the vertical align for the overlay # # vertical_align: bottom # +# # Set the font for the overlay # +# font: fonts/Inter-Medium.ttf # +# # Set the font size for the overlay # +# font_size: 55 # +# # Set the font color for the overlay # +# font_color: "#FFFFFF" # +# # Set the back color for the overlay # +# back_color: "#00000099" # +# # Set the back radius for the overlay # +# back_radius: 30 # +# # Set the back width for the overlay # +# back_width: 305 # +# # Set the back height for the overlay # +# back_height: 105 # # # # # Use the Remux overlay # # use_remux: true # @@ -48,6 +62,13 @@ templates: horizontal_align: left vertical_offset: 30 vertical_align: bottom + font: fonts/Inter-Medium.ttf + font_size: 55 + font_color: "#FFFFFF" + back_color: "#00000099" + back_radius: 30 + back_width: 305 + back_height: 105 collection_level: <> allowed_library_types: <>>> ignore_blank_results: true @@ -59,13 +80,13 @@ templates: horizontal_align: <> vertical_offset: <> vertical_align: <> - font: fonts/Inter-Medium.ttf - font_size: 55 - font_color: "#FFFFFF" - back_color: "#00000099" - back_radius: 30 - back_width: 305 - back_height: 105 + font: <> + font_size: <> + font_color: <> + back_color: <> + back_radius: <> + back_width: <> + back_height: <> overlays: diff --git a/bullmoose20/config.yml b/bullmoose20/config.yml index 88c7b52..1aae166 100644 --- a/bullmoose20/config.yml +++ b/bullmoose20/config.yml @@ -101,7 +101,7 @@ libraries: # Library mappings must have a schedule_easter: daily schedule_valentine: daily schedule_patrick: daily - schedule_thanksgiving: daily + schedule_thanksgiving: range(10/01-10/31) schedule_halloween: daily schedule_christmas: daily schedule_years: daily @@ -110,6 +110,8 @@ libraries: # Library mappings must have a overlay_path: - remove_overlays: false - reapply_overlay: true + - git: PMM/overlays/versions + - git: PMM/overlays/age - git: PMM/overlays/audio_codec # template_variables: # style: standard @@ -173,14 +175,14 @@ libraries: # Library mappings must have a - config/assets operations: - split_duplicates: true + split_duplicates: false assets_for_all: false delete_unmanaged_collections: true mass_user_rating_update: mdb_tomatoes mass_critic_rating_update: imdb mass_audience_rating_update: tmdb mass_genre_update: tmdb - mass_content_rating_update: omdb + mass_content_rating_update: mdb_commonsense mass_originally_available_update: tmdb mass_imdb_parental_labels: without_none @@ -240,6 +242,23 @@ libraries: # Library mappings must have a overlay_path: - remove_overlays: false - reapply_overlay: true + - git: PMM/overlays/versions + - git: PMM/overlays/versions + template_variables: + overlay_level: episode + - git: PMM/overlays/versions + template_variables: + overlay_level: season + - git: PMM/overlays/versions + template_variables: + overlay_level: show + - git: PMM/overlays/age + - git: PMM/overlays/age + template_variables: + overlay_level: episode + - git: PMM/overlays/age + template_variables: + overlay_level: season - git: PMM/overlays/audio_codec - git: PMM/overlays/audio_codec template_variables: @@ -349,7 +368,7 @@ libraries: # Library mappings must have a - git: PMM/overlays/resolution template_variables: overlay_level: season - - git: PMM/overlays/episode_info + - file: config/metadata/overlays/episode_info template_variables: overlay_level: episode - git: PMM/overlays/runtimes @@ -377,18 +396,18 @@ libraries: # Library mappings must have a template_variables: overlay_level: season - git: PMM/overlays/mediastinger - - git: PMM/overlays/mediastinger - template_variables: - overlay_level: episode - - git: PMM/overlays/mediastinger - template_variables: - overlay_level: season + # - git: PMM/overlays/mediastinger + # template_variables: + # overlay_level: episode + # - git: PMM/overlays/mediastinger + # template_variables: + # overlay_level: season settings: asset_directory: - config/assets operations: - split_duplicates: true + split_duplicates: false assets_for_all: false delete_unmanaged_collections: true mass_critic_rating_update: imdb @@ -397,7 +416,7 @@ libraries: # Library mappings must have a mass_episode_critic_rating_update: imdb mass_episode_audience_rating_update: tmdb mass_genre_update: tmdb - mass_content_rating_update: omdb + mass_content_rating_update: mdb_commonsense mass_originally_available_update: tmdb mass_imdb_parental_labels: without_none playlist_files: