[102] Merge remote-tracking branch 'bull/nightly' into nightly

# Conflicts:
#	VERSION
This commit is contained in:
meisnate12 2022-10-07 09:08:27 -04:00
commit 18e5f92b6b
7 changed files with 112 additions and 9 deletions

View file

@ -1 +1 @@
1.17.3-develop101
1.17.3-develop102

View file

@ -27,7 +27,7 @@
# # Set the back radius for the overlay #
# back_radius: 30 #
# # Set the back width for the overlay #
# back_width: 300 #
# back_width: 305 #
# # Sets the style of overlay: standard or compact #
# style: compact #
# #

View file

@ -33,7 +33,7 @@
# # Set the back radius for the overlay #
# back_radius: 30 #
# # Set the back width for the overlay #
# back_width: 300 #
# back_width: 305 #
# # Set the back height for the overlay #
# back_height: 105 #
# #
@ -72,7 +72,7 @@ templates:
font_color: "#FFFFFF"
back_color: "#00000099"
back_radius: 30
back_width: 300
back_width: 305
back_height: 105
overlay_level: <<overlay_level>>
allowed_library_types: <<use_<<slug>>>>

View file

@ -35,7 +35,7 @@ templates:
vertical_align: bottom
back_color: "#00000099"
back_radius: 30
back_width: 290
back_width: 305
back_height: 170
collection_level: <<overlay_level>>
overlay:

View file

@ -28,7 +28,7 @@
# # Set the back radius for the overlay #
# back_radius: 30 #
# # Set the back width for the overlay #
# back_width: 300 #
# back_width: 305 #
# # Set the back height for the overlay #
# back_height: 105 #
#############################################################
@ -48,7 +48,7 @@ templates:
font_color: "#FFFFFF"
back_color: "#00000099"
back_radius: 30
back_width: 300
back_width: 305
back_height: 105
overlay_level: <<overlay_level>>
overlay:

View file

@ -46,8 +46,8 @@ templates:
font_color: "#FFFFFF"
back_color: "#00000099"
back_radius: 30
back_width: 165
back_height: 165
back_width: 160
back_height: 160
back_align: center
back_padding: 15
addon_position: top

View file

@ -0,0 +1,103 @@
#############################################################
# Status Overlays #
# Created by Yozora, Bullmoose20, & Sohjiro #
# Credit to Magic815 for base images #
#############################################################
# Call this from your config.yml (Show): #
# If nothing is specified these are the defaults #
# #
# overlay_path: #
# - pmm: status #
# template_variables: #
# # Set the horizontal offset for the overlay #
# horizontal_offset: 15 #
# # Set the horizontal align for the overlay #
# horizontal_align: left #
# # Set the vertical offset for the overlay #
# vertical_offset: 330 #
# # 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: 305 #
# #
# # Use the ended overlay #
# use_ended: true #
# # Use the airing overlay #
# use_airing: true #
# # Use the canceled overlay #
# use_canceled: true #
# # Number of days since last episode air date #
# last: 14 #
#############################################################
templates:
tmdb_status:
conditionals:
all:
conditions:
- key: [ended, returning, canceled]
value: true
tmdb:
conditions:
- key: [ended, returning, canceled]
value: <<key>>
optional:
- use_<<key>>
- back_width
- last
default:
key: <<tmdb>>
horizontal_offset: 15
horizontal_align: left
vertical_offset: 330
vertical_align: top
font: fonts/Inter-Medium.ttf
font_size: 50
font_color: "#FFFFFF"
back_color: "#00000099"
back_radius: 30
back_width: 305
back_height: 105
weight_<<key>>: <<weight>>
text_<<key>>: <<text>>
all: true
ignore_blank_results: true
allowed_library_types: <<use_<<key>>>>
overlay:
name: text(<<text_<<key>>>>)
group: tmdb_status
weight: <<weight_<<key>>>>
horizontal_offset: <<horizontal_offset>>
horizontal_align: <<horizontal_align>>
vertical_offset: <<vertical_offset>>
vertical_align: <<vertical_align>>
font: <<font>>
font_size: <<font_size>>
font_color: <<font_color>>
back_color: <<back_color>>
back_radius: <<back_radius>>
back_width: <<back_width>>
back_height: <<back_height>>
plex_search:
any:
episode_air_date: <<last>>
plex_all: <<all>>
filters:
tmdb_status: <<tmdb>>
overlays:
ended_shows:
template: {name: tmdb_status, key: ended, text: ENDED, weight: 30}
canceled_shows:
template: {name: tmdb_status, key: canceled, text: CANCELED, weight: 40}
returning_shows:
template: {name: tmdb_status, key: returning, text: RETURNING, weight: 50}
airing_shows:
template: {name: tmdb_status, key: airing, last: 14, text: AIRING, weight: 60}