[1] fix resolution default

pull/1168/head
meisnate12 2 years ago
parent 4694b87ee2
commit cd95d1d56c

@ -1 +1 @@
1.18.0
1.18.0-develop1

@ -183,196 +183,196 @@ overlays:
4K-DV-Dovetail:
variables: {key: 4k, alt: dv, weight: 150, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
4K-HDR-Dovetail:
variables: {key: 4k, alt: hdr, weight: 140, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
4K-Dovetail:
variables: {key: 4k, alt: "", weight: 130, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
1080P-DV-Dovetail:
variables: {key: 1080p, alt: dv, weight: 120, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
1080P-HDR-Dovetail:
variables: {key: 1080p, alt: hdr, weight: 110, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
1080P-Dovetail:
variables: {key: 1080p, alt: "", weight: 100, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
720P-DV-Dovetail:
variables: {key: 720p, alt: dv, weight: 90, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
720P-HDR-Dovetail:
variables: {key: 720p, alt: hdr, weight: 80, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
720P-Dovetail:
variables: {key: 720p, alt: "", weight: 70, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
576P-DV-Dovetail:
variables: {key: 576p, alt: dv, weight: 60, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
576P-HDR-Dovetail:
variables: {key: 576p, alt: hdr, weight: 50, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
576P-Dovetail:
variables: {key: 576p, alt: "", weight: 40, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
480P-DV-Dovetail:
variables: {key: 480p, alt: dv, weight: 30, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
480P-HDR-Dovetail:
variables: {key: 480p, alt: hdr, weight: 20, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
480P-Dovetail:
variables: {key: 480p, alt: "", weight: 10, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
DV-Dovetail:
variables: {key: "", alt: dv, weight: 5, type: resolution_dovetail, all: true, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
HDR-Dovetail:
variables: {key: "", alt: hdr, weight: 1, type: resolution_dovetail, allowed_libraries: movie}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
Directors-Cut-Dovetail:
variables: {key: directorscut, weight: 150, search: Director, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Extended-Edition-Dovetail:
variables: {key: extended, weight: 140, search: Extend, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Uncut-Edition-Dovetail:
variables: {key: uncut, weight: 130, search: Uncut, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Unrated-Edition-Dovetail:
variables: {key: unrated, weight: 120, search: Unrat, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Special-Edition-Dovetail:
variables: {key: special, weight: 110, search: Special, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Final-Cut-Dovetail:
variables: {key: finalcut, weight: 100, search: Final, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Anniversary-Edition-Dovetail:
variables: {key: anniversary, weight: 90, search: Anniversary, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Collectors-Edition-Dovetail:
variables: {key: collector, weight: 80, search: Collector, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
International-Cut-Dovetail:
variables: {key: international, weight: 70, search: International, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Theatrical-Cut-Dovetail:
variables: {key: theatrical, weight: 60, search: Theatrical, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Ultimate-Cut-Dovetail:
variables: {key: ultimate, weight: 50, search: Ultimate, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
IMAX-E-Dovetail:
variables: {key: enhanced, weight: 40, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
IMAX-Dovetail:
variables: {key: imax, weight: 30, search: Imax, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Remastered-Dovetail:
variables: {key: remastered, weight: 20, search: Remaster, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Criterion-Dovetail:
variables: {key: criterion, weight: 10, search: Criterion, type: edition_dovetail, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
4K-DV:
variables: {key: 4k, alt: dv, weight: 150, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
4K-HDR:
variables: {key: 4k, alt: hdr, weight: 140, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
4K:
variables: {key: 4k, alt: "", weight: 130, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
1080P-DV:
variables: {key: 1080p, alt: dv, weight: 120, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
1080P-HDR:
variables: {key: 1080p, alt: hdr, weight: 110, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
1080P:
variables: {key: 1080p, alt: "", weight: 100, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
720P-DV:
variables: {key: 720p, alt: dv, weight: 90, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
720P-HDR:
variables: {key: 720p, alt: hdr, weight: 80, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
720P:
variables: {key: 720p, alt: "", weight: 70, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
576P-DV:
variables: {key: 576p, alt: dv, weight: 60, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
576P-HDR:
variables: {key: 576p, alt: hdr, weight: 50, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
576P:
variables: {key: 576p, alt: "", weight: 40, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
480P-DV:
variables: {key: 480p, alt: dv, weight: 30, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
480P-HDR:
variables: {key: 480p, alt: hdr, weight: 20, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
480P:
variables: {key: 480p, alt: "", weight: 10, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
DV:
variables: {key: "", alt: dv, weight: 5, type: resolution, all: true}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
HDR:
variables: {key: "", alt: hdr, weight: 1, type: resolution}
template: [name: standard, name: resolution]
template: [name: resolution, name: standard]
Directors-Cut:
variables: {key: directorscut, weight: 150, search: Director, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Extended-Edition:
variables: {key: extended, weight: 140, search: Extend, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Uncut-Edition:
variables: {key: uncut, weight: 130, search: Uncut, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Unrated-Edition:
variables: {key: unrated, weight: 120, search: Unrat, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Special-Edition:
variables: {key: special, weight: 110, search: Special, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Final-Cut:
variables: {key: finalcut, weight: 100, search: Final, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Anniversary-Edition:
variables: {key: anniversary, weight: 90, search: Anniversary, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Collectors-Edition:
variables: {key: collector, weight: 80, search: Collector, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
International-Cut:
variables: {key: international, weight: 70, search: International, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Theatrical-Cut:
variables: {key: theatrical, weight: 60, search: Theatrical, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Ultimate-Cut:
variables: {key: ultimate, weight: 50, search: Ultimate, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
IMAX-E:
variables: {key: enhanced, weight: 40, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
IMAX:
variables: {key: imax, weight: 30, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Remastered:
variables: {key: remastered, weight: 20, search: Remaster, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]
Criterion:
variables: {key: criterion, weight: 10, search: Criterion, type: edition, allowed_libraries: movie}
template: [name: standard, name: edition]
template: [name: edition, name: standard]

@ -23,8 +23,10 @@ external_templates:
templates:
video_format:
default:
regex_<<key>>: <<regex>>
conditionals:
filepath:
regex:
conditions:
- key: remux
value: '(?i)\[Remux'
@ -41,7 +43,7 @@ templates:
ignore_blank_results: true
plex_all: true
filters:
filepath.regex: <<filepath>>
filepath.regex: <<regex_<<key>>>>
overlays:

@ -74,11 +74,12 @@ All [Shared Overlay Variables](../overlay_variables) are available with the defa
| `back_width` | `305` |
| `back_height` | `105`/`189` |
| Variable | Description & Values |
|:-------------------------------|:-------------------------------------------------------------------------------------------------------------|
| `style` | **Description:** Choose the Overlay Style.<br>**Default:** `compact`<br>**Values:** `compact` or `standard` |
| `overlay_level` | **Description:** Choose the Overlay Level.<br>**Values:** `season` or `episode` |
| `weight_<<key>>`<sup>1</sup> | **Description:** Controls the weight of the Overlay. Higher numbers have priority.<br>**Values:** Any Number |
| Variable | Description & Values |
|:-----------------------------|:-------------------------------------------------------------------------------------------------------------|
| `style` | **Description:** Choose the Overlay Style.<br>**Default:** `compact`<br>**Values:** `compact` or `standard` |
| `overlay_level` | **Description:** Choose the Overlay Level.<br>**Values:** `season` or `episode` |
| `weight_<<key>>`<sup>1</sup> | **Description:** Controls the weight of the Overlay. Higher numbers have priority.<br>**Values:** Any Number |
| `regex_<<key>>`<sup>1</sup> | **Description:** Controls the regex of the Overlay Search.<br>**Values:** Any Proper Regex |
1. Each default overlay has a `key` that when calling to effect a specific collection you must replace `<<key>>` with when calling.

@ -60,8 +60,6 @@ All [Shared Overlay Variables](../overlay_variables) are available with the defa
| Variable | Description & Values |
|:-----------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `text_<<key>>`<sup>1</sup> | **Description:** Choose the text for the Overlay.<br>**Default:** <table class="clearTable"><tr><th>Key</th><th>Default</th></tr><tr><td>`remux`</td><td>`REMUX`</td></tr><tr><td>`bluray`</td><td>`BLU-RAY`</td></tr><tr><td>`web`</td><td>`WEB`</td></tr><tr><td>`hdtv`</td><td>`HDTV`</td></tr><tr><td>`dvd`</td><td>`DVD`</td></tr><tr><td>`sdtv`</td><td>`SDTV`</td></tr></table>**Values:** Any String |
| `weight_<<key>>`<sup>1</sup> | **Description:** Controls the weight of the Overlay. Higher numbers have priority.<br>**Values:** Any Number |
| `overlay_level` | **Description:** Choose the Overlay Level.<br>**Values:** `season` or `episode` |
| `font` | **Description:** Choose the font for the Overlay.<br>**Default:** `fonts/Inter-Medium.ttf`<br>**Values:** Path to font file |
| `font_style` | **Description:** Font style for Variable Fonts.<br>**Values:** Variable Font Style |
@ -69,6 +67,9 @@ All [Shared Overlay Variables](../overlay_variables) are available with the defa
| `font_color` | **Description:** Choose the font color for the Overlay.<br>**Default:** `#FFFFFF`<br>**Values:** Color Hex Code in format `#RGB`, `#RGBA`, `#RRGGBB` or `#RRGGBBAA` |
| `stroke_width` | **Description:** Font Stroke Width for the Text Overlay.<br>**Values:** Any Number greater then 0 |
| `stroke_color` | **Description:** Font Stroke Color for the Text Overlay.<br>**Values:** Color Hex Code in format `#RGB`, `#RGBA`, `#RRGGBB` or `#RRGGBBAA` |
| `text_<<key>>`<sup>1</sup> | **Description:** Choose the text for the Overlay.<br>**Default:** <table class="clearTable"><tr><th>Key</th><th>Default</th></tr><tr><td>`remux`</td><td>`REMUX`</td></tr><tr><td>`bluray`</td><td>`BLU-RAY`</td></tr><tr><td>`web`</td><td>`WEB`</td></tr><tr><td>`hdtv`</td><td>`HDTV`</td></tr><tr><td>`dvd`</td><td>`DVD`</td></tr><tr><td>`sdtv`</td><td>`SDTV`</td></tr></table>**Values:** Any String |
| `weight_<<key>>`<sup>1</sup> | **Description:** Controls the weight of the Overlay. Higher numbers have priority.<br>**Values:** Any Number |
| `regex_<<key>>`<sup>1</sup> | **Description:** Controls the regex of the Overlay Search.<br>**Values:** Any Proper Regex |
1. Each default overlay has a `key` that when calling to effect a specific collection you must replace `<<key>>` with when calling.

Loading…
Cancel
Save