Plex
/
Plex-Meta-Manager
mirror of https://github.com/meisnate12/Plex-Meta-Manager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[132] update resolution

Browse Source
pull/1343/head
meisnate12 2 years ago
parent 8403175398
commit 608cadff7d
8 changed files with 96 additions and 85 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.18.3-develop131 1.18.3-develop132

11
defaults/both/universe.yml
Unescape View File

@ -21,8 +21,6 @@ templates:
minimum_items: 2 minimum_items: 2
optional: optional:
- name_mapping - name_mapping
- name_<<key>>
- summary_<<key>>
- trakt_list_<<key>> - trakt_list_<<key>>
- imdb_list_<<key>> - imdb_list_<<key>>
- mdblist_list - mdblist_list
@ -31,8 +29,6 @@ templates:
imdb_list: <<imdb_list_<<key>>>> imdb_list: <<imdb_list_<<key>>>>
trakt_list: <<trakt_list_<<key>>>> trakt_list: <<trakt_list_<<key>>>>
mdblist_list: <<mdblist_list_<<key>>>> mdblist_list: <<mdblist_list_<<key>>>>
summary: <<summary_<<key>>>>
name: <<name_<<key>>>>
collections: collections:
Universe Collections: Universe Collections:
@ -62,13 +58,12 @@ dynamic_collections:
mummy: The Mummy Universe mummy: The Mummy Universe
wizard: Wizarding World wizard: Wizarding World
xmen: X-Men Universe xmen: X-Men Universe
template: template:
- universe - universe
- shared
- arr - arr
- custom - custom
- translation
- shared
template_variables: template_variables:
allowed_libraries: allowed_libraries:
avp: movie avp: movie
@ -93,7 +88,5 @@ dynamic_collections:
askew: https://mdblist.com/lists/plexmetamanager/external/15362 askew: https://mdblist.com/lists/plexmetamanager/external/15362
wizard: https://mdblist.com/lists/plexmetamanager/external/9242 wizard: https://mdblist.com/lists/plexmetamanager/external/9242
xmen: https://mdblist.com/lists/plexmetamanager/external/9244 xmen: https://mdblist.com/lists/plexmetamanager/external/9244
image: image:
default: universe/<<key>> default: universe/<<key>>

0
defaults/overlays/images/edition/codacut.png → defaults/overlays/images/edition/coda.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
defaults/overlays/images/edition/directorscut.png → defaults/overlays/images/edition/directors.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
defaults/overlays/images/edition/finalcut.png → defaults/overlays/images/edition/final.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

131
defaults/overlays/resolution.yml
Unescape View File

@ -34,24 +34,25 @@ external_templates:
- HDR - HDR
- type: resolution_dovetail - type: resolution_dovetail
value: value:
- Directors-Cut
- Extended-Edition - Extended-Edition
- Uncut-Edition - Uncut-Edition
- Unrated-Edition - Unrated-Edition
- Special-Edition - Special-Edition
- Final-Cut
- Anniversary-Edition - Anniversary-Edition
- Collectors-Edition - Collectors-Edition
- Diamond-Edition
- Platinum-Edition
- Directors-Cut
- Final-Cut
- International-Cut - International-Cut
- Theatrical-Cut - Theatrical-Cut
- Ultimate-Cut - Ultimate-Cut
- IMAX-E - Alternate-Cut
- Coda-Cut
- IMAX-Enhanced
- IMAX - IMAX
- Remastered - Remastered
- Criterion - Criterion
- Coda
- Diamond
- Platinum
final_horizontal_offset: final_horizontal_offset:
default: <<horizontal_offset>> default: <<horizontal_offset>>
conditions: conditions:
@ -61,7 +62,11 @@ external_templates:
default: <<vertical_offset>> default: <<vertical_offset>>
conditions: conditions:
- type: edition_dovetail - type: edition_dovetail
vertical_align: "bottom" vertical_align: bottom
key: [remastered, coda]
value: <<vertical_offset-10>>
- type: edition_dovetail
vertical_align: bottom
value: <<vertical_offset>> value: <<vertical_offset>>
- type: edition_dovetail - type: edition_dovetail
value: <<vertical_offset+64>> value: <<vertical_offset+64>>
@ -251,41 +256,53 @@ overlays:
variables: {key: "", alt: hdr, weight: 1, type: resolution_dovetail, allowed_libraries: movie} variables: {key: "", alt: hdr, weight: 1, type: resolution_dovetail, allowed_libraries: movie}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
Directors-Cut-Dovetail:
variables: {key: directorscut, weight: 150, search: Director, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Extended-Edition-Dovetail: Extended-Edition-Dovetail:
variables: {key: extended, weight: 140, search: Extend, type: edition_dovetail, allowed_libraries: movie} variables: {key: extended, weight: 190, search: Extend, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Uncut-Edition-Dovetail: Uncut-Edition-Dovetail:
variables: {key: uncut, weight: 130, search: Uncut, type: edition_dovetail, allowed_libraries: movie} variables: {key: uncut, weight: 180, search: Uncut, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Unrated-Edition-Dovetail: Unrated-Edition-Dovetail:
variables: {key: unrated, weight: 120, search: Unrat, type: edition_dovetail, allowed_libraries: movie} variables: {key: unrated, weight: 170, search: Unrat, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Special-Edition-Dovetail: Special-Edition-Dovetail:
variables: {key: special, weight: 110, search: Special, type: edition_dovetail, allowed_libraries: movie} variables: {key: special, weight: 160, search: Special, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Final-Cut-Dovetail:
variables: {key: finalcut, weight: 100, search: Final, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Anniversary-Edition-Dovetail: Anniversary-Edition-Dovetail:
variables: {key: anniversary, weight: 90, search: Anniversary, type: edition_dovetail, allowed_libraries: movie} variables: {key: anniversary, weight: 150, search: Anniversary, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Collectors-Edition-Dovetail: Collectors-Edition-Dovetail:
variables: {key: collector, weight: 80, search: Collector, type: edition_dovetail, allowed_libraries: movie} variables: {key: collector, weight: 140, search: Collector, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Diamond-Edition-Dovetail:
variables: {key: diamond, weight: 130, search: Diamond, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Platinum-Edition-Dovetail:
variables: {key: platinum, weight: 120, search: Platinum, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Directors-Cut-Dovetail:
variables: {key: directors, weight: 110, search: Director, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Final-Cut-Dovetail:
variables: {key: final, weight: 100, search: Final, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
International-Cut-Dovetail: International-Cut-Dovetail:
variables: {key: international, weight: 70, search: International, type: edition_dovetail, allowed_libraries: movie} variables: {key: international, weight: 90, search: International, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Theatrical-Cut-Dovetail: Theatrical-Cut-Dovetail:
variables: {key: theatrical, weight: 60, search: Theatrical, type: edition_dovetail, allowed_libraries: movie} variables: {key: theatrical, weight: 80, search: Theatrical, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Ultimate-Cut-Dovetail: Ultimate-Cut-Dovetail:
variables: {key: ultimate, weight: 50, search: Ultimate, type: edition_dovetail, allowed_libraries: movie} variables: {key: ultimate, weight: 70, search: Ultimate, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
IMAX-E-Dovetail: Alternate-Cut-Dovetail:
variables: {key: enhanced, weight: 40, type: edition_dovetail, allowed_libraries: movie} variables: {key: alternate, weight: 60, search: Alternate, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Coda-Cut-Dovetail:
variables: {key: coda, weight: 50, search: Coda, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
IMAX-Enhanced-Dovetail:
variables: {key: enhanced, weight: 40, search: IMAX Enhanced, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
IMAX-Dovetail: IMAX-Dovetail:
variables: {key: imax, weight: 30, search: Imax, type: edition_dovetail, allowed_libraries: movie} variables: {key: imax, weight: 30, search: Imax, type: edition_dovetail, allowed_libraries: movie}
@ -296,15 +313,7 @@ overlays:
Criterion-Dovetail: Criterion-Dovetail:
variables: {key: criterion, weight: 10, search: Criterion, type: edition_dovetail, allowed_libraries: movie} variables: {key: criterion, weight: 10, search: Criterion, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Coda-Dovetail:
variables: {key: codacut, weight: 9, search: Coda, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Diamond-Dovetail:
variables: {key: diamond, weight: 8, search: Diamond, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Platinum-Dovetail:
variables: {key: platinum, weight: 7, search: Platinum, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
4K-DV: 4K-DV:
variables: {key: 4k, alt: dv, weight: 150, type: resolution} variables: {key: 4k, alt: dv, weight: 150, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
@ -356,41 +365,54 @@ overlays:
HDR: HDR:
variables: {key: "", alt: hdr, weight: 1, type: resolution} variables: {key: "", alt: hdr, weight: 1, type: resolution}
template: [name: resolution, name: standard] template: [name: resolution, name: standard]
Directors-Cut:
variables: {key: directorscut, weight: 150, search: Director, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard]
Extended-Edition: Extended-Edition:
variables: {key: extended, weight: 140, search: Extend, type: edition, allowed_libraries: movie} variables: {key: extended, weight: 190, search: Extend, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Uncut-Edition: Uncut-Edition:
variables: {key: uncut, weight: 130, search: Uncut, type: edition, allowed_libraries: movie} variables: {key: uncut, weight: 180, search: Uncut, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Unrated-Edition: Unrated-Edition:
variables: {key: unrated, weight: 120, search: Unrat, type: edition, allowed_libraries: movie} variables: {key: unrated, weight: 170, search: Unrat, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Special-Edition: Special-Edition:
variables: {key: special, weight: 110, search: Special, type: edition, allowed_libraries: movie} variables: {key: special, weight: 160, search: Special, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard]
Final-Cut:
variables: {key: finalcut, weight: 100, search: Final, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Anniversary-Edition: Anniversary-Edition:
variables: {key: anniversary, weight: 90, search: Anniversary, type: edition, allowed_libraries: movie} variables: {key: anniversary, weight: 150, search: Anniversary, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Collectors-Edition: Collectors-Edition:
variables: {key: collector, weight: 80, search: Collector, type: edition, allowed_libraries: movie} variables: {key: collector, weight: 140, search: Collector, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard]
Diamond-Edition:
variables: {key: diamond, weight: 130, search: Diamond, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Platinum-Edition:
variables: {key: platinum, weight: 120, search: Platinum, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Directors-Cut:
variables: {key: directors, weight: 110, search: Director, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard]
Final-Cut:
variables: {key: final, weight: 100, search: Final, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
International-Cut: International-Cut:
variables: {key: international, weight: 70, search: International, type: edition, allowed_libraries: movie} variables: {key: international, weight: 90, search: International, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Theatrical-Cut: Theatrical-Cut:
variables: {key: theatrical, weight: 60, search: Theatrical, type: edition, allowed_libraries: movie} variables: {key: theatrical, weight: 80, search: Theatrical, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Ultimate-Cut: Ultimate-Cut:
variables: {key: ultimate, weight: 50, search: Ultimate, type: edition, allowed_libraries: movie} variables: {key: ultimate, weight: 70, search: Ultimate, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard]
Alternate-Cut:
variables: {key: alternate, weight: 60, search: Alternate, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
IMAX-E: Coda-Cut:
variables: {key: enhanced, weight: 40, type: edition, allowed_libraries: movie} variables: {key: coda, weight: 50, search: Coda, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
IMAX-Enhanced:
variables: {key: enhanced, weight: 40, search: IMAX Enhanced, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
IMAX: IMAX:
variables: {key: imax, weight: 30, type: edition, allowed_libraries: movie} variables: {key: imax, weight: 30, type: edition, allowed_libraries: movie}
@ -401,15 +423,6 @@ overlays:
Criterion: Criterion:
variables: {key: criterion, weight: 10, search: Criterion, type: edition, allowed_libraries: movie} variables: {key: criterion, weight: 10, search: Criterion, type: edition, allowed_libraries: movie}
template: [name: edition, name: standard] template: [name: edition, name: standard]
Coda:
variables: {key: codacut, weight: 9, search: Coda, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Diamond:
variables: {key: diamond, weight: 8, search: Diamond, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]
Platinum:
variables: {key: platinum, weight: 7, search: Platinum, type: edition_dovetail, allowed_libraries: movie}
template: [name: edition, name: standard]

26
docs/defaults/overlays/resolution.md
Unescape View File

@ -26,17 +26,21 @@ Recommendations: Editions overlay is designed to use the Editions field within P
| Edition | Key | Weight | | Edition | Key | Weight |
|:--------------------|:----------------|:-------| |:--------------------|:----------------|:-------|
| Director's Cut | `directorscut` | `150` | | Extended Edition | `extended` | `190` |
| Extended Edition | `extended` | `140` | | Uncut Edition | `uncut` | `180` |
| Uncut Edition | `uncut` | `130` | | Unrated Edition | `unrated` | `170` |
| Unrated Edition | `unrated` | `120` | | Special Edition | `special` | `160` |
| Special Edition | `special` | `110` | | Anniversary Edition | `anniversary` | `150` |
| Final Cut | `finalcut` | `100` | | Collector's Edition | `collector` | `140` |
| Anniversary Edition | `anniversary` | `90` | | Diamond Edition | `diamond` | `130` |
| Collector's Edition | `collector` | `80` | | Platinum Edition | `platinum` | `120` |
| International Cut | `international` | `70` | | Director's Cut | `directors` | `110` |
| Theatrical Cut | `theatrical` | `60` | | Final Cut | `final` | `100` |
| Ultimate Cut | `ultimate` | `50` | | International Cut | `international` | `90` |
| Theatrical Cut | `theatrical` | `80` |
| Ultimate Cut | `ultimate` | `70` |
| Alternate Cut | `alternate` | `60` |
| Coda Cut | `coda` | `50` |
| IMAX Enhanced | `enhanced` | `40` | | IMAX Enhanced | `enhanced` | `40` |
| IMAX | `imax` | `30` | | IMAX | `imax` | `30` |
| Remastered | `remastered` | `20` | | Remastered | `remastered` | `20` |

9
modules/meta.py
Unescape View File

@ -631,10 +631,9 @@ class MetadataFile(DataFile):
elif "styles" not in set_data: elif "styles" not in set_data:
raise Failed("Set Data must have the styles attribute") raise Failed("Set Data must have the styles attribute")
styles = util.parse("Set Data", "styles", set_data["styles"], datatype="dictlist") styles = util.parse("Set Data", "styles", set_data["styles"], datatype="dictlist")
if "default" not in styles or not styles["default"]: if "default" not in styles:
raise Failed("Set Data styles attribute must have a default") raise Failed("Set Data styles attribute must have a default")
style = styles["default"][0] if styles["default"] not in styles:
if style not in styles:
raise Failed(f"Set Data styles default style not found. Options: {', '.join([s for s in styles])}") raise Failed(f"Set Data styles default style not found. Options: {', '.join([s for s in styles])}")
use_key = None use_key = None
if f"use_{set_key}" in methods: if f"use_{set_key}" in methods:
@ -642,12 +641,13 @@ class MetadataFile(DataFile):
logger.info(f"Use {set_key}: {use_key}") logger.info(f"Use {set_key}: {use_key}")
if use_key is False or (use_all is False and use_key is None): if use_key is False or (use_all is False and use_key is None):
continue continue
style = styles["default"]
if f"style_{set_key}" in methods: if f"style_{set_key}" in methods:
style = util.parse("Images", f"style_{set_key}", self.temp_vars, methods=methods, default=style) style = util.parse("Images", f"style_{set_key}", self.temp_vars, methods=methods, default=style)
logger.info(f"Style {set_key}: {style}") logger.info(f"Style {set_key}: {style}")
if style not in styles: if style not in styles:
logger.warning(f"Image Set Warning: {set_key} has no style: {style} using default: {styles['default']}. Options: {', '.join([s for s in styles])}") logger.warning(f"Image Set Warning: {set_key} has no style: {style} using default: {styles['default']}. Options: {', '.join([s for s in styles])}")
style = styles["default"][0] style = styles["default"]
if "collections" in set_data and set_data["collections"]: if "collections" in set_data and set_data["collections"]:
self.set_collections[set_key] = set_data["collections"] self.set_collections[set_key] = set_data["collections"]
image_set = self.temp_vars[methods[f"set_file_{set_key}"]] if f"set_file_{set_key}" in methods else styles[style] image_set = self.temp_vars[methods[f"set_file_{set_key}"]] if f"set_file_{set_key}" in methods else styles[style]
@ -1751,6 +1751,7 @@ class MetadataFile(DataFile):
episodes = {} episodes = {}
for episode in season.episodes(): for episode in season.episodes():
episodes[episode.title] = episode episodes[episode.title] = episode
if episode.index:
episodes[int(episode.index)] = episode episodes[int(episode.index)] = episode
for episode_id, episode_dict in season_dict[season_methods["episodes"]].items(): for episode_id, episode_dict in season_dict[season_methods["episodes"]].items():
updated = False updated = False

Write Preview
Loading…
Cancel
Save