Mirrors/Plex-Meta-Manager
2
0
Fork 0
mirror of https://github.com/meisnate12/Plex-Meta-Manager synced 2024-11-10 06:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[44] Merge remote-tracking branch 'anon_fawkes/resolution-fix-dvhdr' into nightly

Browse source
This commit is contained in:
meisnate12 2024-03-26 12:22:06 -04:00
commit 49aa9ef0aa
8 changed files with 83 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
defaults/overlays/images/resolution/1080pdvhdrplus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
defaults/overlays/images/resolution/480pdvhdrplus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
defaults/overlays/images/resolution/4kdvhdrplus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
defaults/overlays/images/resolution/576pdvhdrplus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
defaults/overlays/images/resolution/720pdvhdrplus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
defaults/overlays/images/resolution/dvhdrplus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

46
defaults/overlays/resolution.yml
View file

@ -15,31 +15,37 @@ external_templates:
conditions: conditions:
- type: edition_dovetail - type: edition_dovetail
value: value:
- 4K-DV-HDR-Plus
- 4K-DV-HDR - 4K-DV-HDR
- 4K-Plus - 4K-Plus
- 4K-DV - 4K-DV
- 4K-HDR - 4K-HDR
- 4K - 4K
- 1080P-DV-HDR-Plus
- 1080P-DV-HDR - 1080P-DV-HDR
- 1080P-Plus - 1080P-Plus
- 1080P-DV - 1080P-DV
- 1080P-HDR - 1080P-HDR
- 1080P - 1080P
- 720P-DV-HDR-Plus
- 720P-DV-HDR - 720P-DV-HDR
- 720P-Plus - 720P-Plus
- 720P-DV - 720P-DV
- 720P-HDR - 720P-HDR
- 720P - 720P
- 576P-DV-HDR-Plus
- 576P-DV-HDR - 576P-DV-HDR
- 576P-Plus - 576P-Plus
- 576P-DV - 576P-DV
- 576P-HDR - 576P-HDR
- 576P - 576P
- 480P-DV-HDR-Plus
- 480P-DV-HDR - 480P-DV-HDR
- 480P-Plus - 480P-Plus
- 480P-DV - 480P-DV
- 480P-HDR - 480P-HDR
- 480P - 480P
- DV-HDR-Plus
- DV-HDR - DV-HDR
- Plus - Plus
- DV - DV
@ -211,7 +217,9 @@ templates:
- alt: plus - alt: plus
value: '(?i)\bhdr10(\+|p(lus)?\b)' value: '(?i)\bhdr10(\+|p(lus)?\b)'
- alt: dvhdr - alt: dvhdr
value: '(?i)\bdv((.hdr10?\b)|(.hdr10(\+|p(lus)?\b)))' value: '(?i)\bdv((.hdr10?\b)'
- alt: dvhdrplus
value: '(?i)\bdv.HDR10(\+|P(lus)?\b)'
optional: optional:
- all - all
- use_<<key>> - use_<<key>>
@ -239,6 +247,9 @@ templates:
overlays: overlays:
4K-DV-HDR-Plus-Dovetail:
variables: {key: 4k, alt: dvhdrplus, weight: 160, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard]
4K-DV-HDR-Dovetail: 4K-DV-HDR-Dovetail:
variables: {key: 4k, alt: dvhdr, weight: 158, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 4k, alt: dvhdr, weight: 158, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -254,6 +265,9 @@ overlays:
4K-Dovetail: 4K-Dovetail:
variables: {key: 4k, alt: "", weight: 130, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 4k, alt: "", weight: 130, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
1080P-DV-HDR-Plus-Dovetail:
variables: {key: 1080p, alt: dvhdrplus, weight: 130, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard]
1080P-DV-HDR-Dovetail: 1080P-DV-HDR-Dovetail:
variables: {key: 1080p, alt: dvhdr, weight: 128, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 1080p, alt: dvhdr, weight: 128, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -269,6 +283,9 @@ overlays:
1080P-Dovetail: 1080P-Dovetail:
variables: {key: 1080p, alt: "", weight: 100, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 1080p, alt: "", weight: 100, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
720P-DV-HDR-Plus-Dovetail:
variables: {key: 720p, alt: dvhdrplus, weight: 99, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard]
720P-DV-HDR-Dovetail: 720P-DV-HDR-Dovetail:
variables: {key: 720p, alt: dvhdr, weight: 98, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 720p, alt: dvhdr, weight: 98, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -284,6 +301,9 @@ overlays:
720P-Dovetail: 720P-Dovetail:
variables: {key: 720p, alt: "", weight: 70, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 720p, alt: "", weight: 70, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
576P-DV-HDR-Plus-Dovetail:
variables: {key: 576p, alt: dvhdrplus, weight: 69, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard]
576P-DV-HDR-Dovetail: 576P-DV-HDR-Dovetail:
variables: {key: 576p, alt: dvhdr, weight: 68, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 576p, alt: dvhdr, weight: 68, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -299,6 +319,9 @@ overlays:
576P-Dovetail: 576P-Dovetail:
variables: {key: 576p, alt: "", weight: 40, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 576p, alt: "", weight: 40, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
480P-DV-HDR-Plus-Dovetail:
variables: {key: 480p, alt: dvhdrplus, weight: 39, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard]
480P-DV-HDR-Dovetail: 480P-DV-HDR-Dovetail:
variables: {key: 480p, alt: dvhdr, weight: 38, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 480p, alt: dvhdr, weight: 38, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -314,6 +337,9 @@ overlays:
480P-Dovetail: 480P-Dovetail:
variables: {key: 480p, alt: "", weight: 10, type: resolution_dovetail, allowed_libraries: movie} variables: {key: 480p, alt: "", weight: 10, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
DV-HDR-Plus-Dovetail:
variables: {key: "", alt: dvhdrplus, weight: 9, type: resolution_dovetail, all: true, allowed_libraries: movie}
template: [name: resolution, name: standard]
DV-HDR-Dovetail: DV-HDR-Dovetail:
variables: {key: "", alt: dvhdr, weight: 8, type: resolution_dovetail, all: true, allowed_libraries: movie} variables: {key: "", alt: dvhdr, weight: 8, type: resolution_dovetail, all: true, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -397,6 +423,9 @@ overlays:
variables: {key: ulysses, weight: 6, search: Ulysses, type: edition_dovetail, allowed_libraries: movie} variables: {key: ulysses, weight: 6, search: Ulysses, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
4K-DV-HDR-Plus:
variables: {key: 4k, alt: dvhdrplus, weight: 159, type: resolution}
template: [name: resolution, name: standard]
4K-DV-HDR: 4K-DV-HDR:
variables: {key: 4k, alt: dvhdr, weight: 158, type: resolution} variables: {key: 4k, alt: dvhdr, weight: 158, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -412,6 +441,9 @@ overlays:
4K: 4K:
variables: {key: 4k, alt: "", weight: 130, type: resolution} variables: {key: 4k, alt: "", weight: 130, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
1080P-DV-HDR-Plus:
variables: {key: 1080p, alt: dvhdrplus, weight: 129, type: resolution}
template: [name: resolution, name: standard]
1080P-DV-HDR: 1080P-DV-HDR:
variables: {key: 1080p, alt: dvhdr, weight: 128, type: resolution} variables: {key: 1080p, alt: dvhdr, weight: 128, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -427,6 +459,9 @@ overlays:
1080P: 1080P:
variables: {key: 1080p, alt: "", weight: 100, type: resolution} variables: {key: 1080p, alt: "", weight: 100, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
720P-DV-HDR-Plus:
variables: {key: 720p, alt: dvhdrplus, weight: 99, type: resolution}
template: [name: resolution, name: standard]
720P-DV-HDR: 720P-DV-HDR:
variables: {key: 720p, alt: dvhdr, weight: 98, type: resolution} variables: {key: 720p, alt: dvhdr, weight: 98, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -442,6 +477,9 @@ overlays:
720P: 720P:
variables: {key: 720p, alt: "", weight: 70, type: resolution} variables: {key: 720p, alt: "", weight: 70, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
576P-DV-HDR-Plus:
variables: {key: 576p, alt: dvhdrplus, weight: 69, type: resolution}
template: [name: resolution, name: standard]
576P-DV-HDR: 576P-DV-HDR:
variables: {key: 576p, alt: dvhdr, weight: 68, type: resolution} variables: {key: 576p, alt: dvhdr, weight: 68, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -457,6 +495,9 @@ overlays:
576P: 576P:
variables: {key: 576p, alt: "", weight: 40, type: resolution} variables: {key: 576p, alt: "", weight: 40, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
480P-DV-HDR-Plus:
variables: {key: 480p, alt: dvhdrplus, weight: 39, type: resolution}
template: [name: resolution, name: standard]
480P-DV-HDR: 480P-DV-HDR:
variables: {key: 480p, alt: dvhdr, weight: 38, type: resolution} variables: {key: 480p, alt: dvhdr, weight: 38, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -472,6 +513,9 @@ overlays:
480P: 480P:
variables: {key: 480p, alt: "", weight: 10, type: resolution} variables: {key: 480p, alt: "", weight: 10, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
DV-HDR-Plus:
variables: {key: "", alt: dvhdr, weight: 9, type: resolution, all: true}
template: [name: resolution, name: standard]
DV-HDR: DV-HDR:
variables: {key: "", alt: dvhdr, weight: 8, type: resolution, all: true} variables: {key: "", alt: dvhdr, weight: 8, type: resolution, all: true}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]

9
docs/defaults/overlays/resolution.md
View file

@ -15,32 +15,38 @@ the [TRaSH Guides](https://trash-guides.info/) filename naming scheme
## Supported Resolutions ## Supported Resolutions
| Resolution | Key | Weight | | Resolution | Key | Weight |
|:-------------|:--------------|:-------| |:---------------|:-----------------|:-------|
| 4K DV/HDR10+ | `4k_dvhdrplus` | `159` |
| 4K DV/HDR | `4k_dvhdr` | `158` | | 4K DV/HDR | `4k_dvhdr` | `158` |
| 4K HDR10+ | `4k_plus` | `155` | | 4K HDR10+ | `4k_plus` | `155` |
| 4K DV | `4k_dv` | `150` | | 4K DV | `4k_dv` | `150` |
| 4K HDR | `4k_hdr` | `140` | | 4K HDR | `4k_hdr` | `140` |
| 4K | `4k` | `130` | | 4K | `4k` | `130` |
| 1080p DV/HDR10+| `1080p_dvhdrplus`| `129` |
| 1080P DV/HDR | `1080p_dvhdr` | `128` | | 1080P DV/HDR | `1080p_dvhdr` | `128` |
| 1080P HDR10+ | `1080p_plus` | `125` | | 1080P HDR10+ | `1080p_plus` | `125` |
| 1080P DV | `1080p_dv` | `120` | | 1080P DV | `1080p_dv` | `120` |
| 1080P HDR | `1080p_hdr` | `110` | | 1080P HDR | `1080p_hdr` | `110` |
| 1080P | `1080p` | `100` | | 1080P | `1080p` | `100` |
| 720P DV/HDR10+ | `720p_dvhdrplus` | `99` |
| 720P DV/HDR | `720p_dvhdr` | `98` | | 720P DV/HDR | `720p_dvhdr` | `98` |
| 720P HDR10+ | `720p_plus` | `95` | | 720P HDR10+ | `720p_plus` | `95` |
| 720P DV | `720p_dv` | `90` | | 720P DV | `720p_dv` | `90` |
| 720P HDR | `720p_hdr` | `80` | | 720P HDR | `720p_hdr` | `80` |
| 720P | `720p` | `70` | | 720P | `720p` | `70` |
| 576P DV/HDR10+ | `576p_dvhdrplus` | `69` |
| 576P DV/HDR | `576p_dvhdr` | `68` | | 576P DV/HDR | `576p_dvhdr` | `68` |
| 576P HDR10+ | `576p_plus` | `65` | | 576P HDR10+ | `576p_plus` | `65` |
| 576P DV | `576p_dv` | `60` | | 576P DV | `576p_dv` | `60` |
| 576P HDR | `576p_hdr` | `50` | | 576P HDR | `576p_hdr` | `50` |
| 576P | `576p` | `40` | | 576P | `576p` | `40` |
| 480P DV/HDR10+ | `480p_dvhdrplus | `39` |
| 480P DV/HDR | `480p_dvhdr` | `38` | | 480P DV/HDR | `480p_dvhdr` | `38` |
| 480P HDR10+ | `480p_plus` | `35` | | 480P HDR10+ | `480p_plus` | `35` |
| 480P DV | `480p_dv` | `30` | | 480P DV | `480p_dv` | `30` |
| 480P HDR | `480p_hdr` | `20` | | 480P HDR | `480p_hdr` | `20` |
| 480P | `480p` | `10` | | 480P | `480p` | `10` |
| DV/HDR10+ | `dvhdrplus` | `9` |
| DV/HDR | `dvhdr` | `8` | | DV/HDR | `dvhdr` | `8` |
| HDR10+ | `plus` | `7` | | HDR10+ | `plus` | `7` |
| DV | `dv` | `5` | | DV | `dv` | `5` |
@ -168,6 +174,7 @@ work. Any value not specified will use its default value if it has one if not it
overlay_files: overlay_files:
- pmm: resolution - pmm: resolution
template_variables: template_variables:
use_dvhdrplus: false
use_dv: false use_dv: false
use_hdr: false use_hdr: false
use_1080p: false use_1080p: false