From 20a67948d9d7e9c608501e6e149da4e1bcec4683 Mon Sep 17 00:00:00 2001 From: bullmoose20 Date: Thu, 22 Sep 2022 22:02:07 -0400 Subject: [PATCH 1/2] use box images with use_<>: false and new TRaSH naming --- PMM/overlays/resolution.yml | 35 ++--- PMM/overlays/special_release.yml | 237 ++++++++++++++++++++++++++----- 2 files changed, 210 insertions(+), 62 deletions(-) diff --git a/PMM/overlays/resolution.yml b/PMM/overlays/resolution.yml index e3940b1..44034cb 100644 --- a/PMM/overlays/resolution.yml +++ b/PMM/overlays/resolution.yml @@ -56,30 +56,17 @@ templates: allowed_library_types: - <>>> - <>>> - overlay: - name: <> - git: PMM/overlays/images/<> - group: res - weight: <> - horizontal_offset: <> - horizontal_align: <> - vertical_offset: <> - vertical_align: <> - NoResolution: - optional: - - overlay_level - - use_<> - - use_<> - default: - overlay: <> - horizontal_offset: 15 - horizontal_align: left - vertical_offset: 15 - vertical_align: top - collection_level: <> - allowed_library_types: - - <>>> - - <>>> + suppress_overlays: + - Directors-Cut + - Extended-Edition + - Uncut-Edition + - Unrated-Edition + - Special-Edition + - Final-Cut + - IMAX-E + - IMAX + - Remastered + - Criterion overlay: name: <> git: PMM/overlays/images/<> diff --git a/PMM/overlays/special_release.yml b/PMM/overlays/special_release.yml index 0faadef..6ffae9c 100644 --- a/PMM/overlays/special_release.yml +++ b/PMM/overlays/special_release.yml @@ -44,23 +44,25 @@ ############################################################# templates: - SpecialRelease: + Edition: optional: - overlay_level - use_<> default: overlay: <> + extra: '-Box' horizontal_offset: 15 horizontal_align: left - vertical_offset: 99 + vertical_offset: 15 vertical_align: top + group: SpecialReleaseGroup collection_level: <> allowed_library_types: <>>> ignore_blank_results: true overlay: - name: <> - git: PMM/overlays/images/<> - group: special + name: <><> + git: PMM/overlays/images/<><> + group: <> weight: <> horizontal_offset: <> horizontal_align: <> @@ -68,96 +70,255 @@ templates: vertical_align: <> overlays: - Directors-Cut: template: - - name: SpecialRelease - weight: 90 + - name: Edition + weight: 100 slug: directorscut + overlay: Directors-Cut + suppress_overlays: + - Directors-Cut-Dovetail plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bDirector|Directors\b' + filepath.regex: 'edition-(?i)\bDirector|Directors\b' + + Directors-Cut-Dovetail: + template: + - name: Edition + weight: 100 + slug: directorscut + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Directors-Cut + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bDirector|Directors\b' Extended-Edition: template: - - name: SpecialRelease - weight: 80 + - name: Edition + weight: 90 + slug: extended + overlay: Extended-Edition + suppress_overlays: + - Extended-Edition-Dovetail + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bExtended\b' + + Extended-Edition-Dovetail: + template: + - name: Edition + weight: 90 slug: extended + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Extended-Edition plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bExtended\b' + filepath.regex: 'edition-(?i)\bExtended\b' Uncut-Edition: template: - - name: SpecialRelease - weight: 70 + - name: Edition + weight: 80 + slug: uncut + overlay: Uncut-Edition + suppress_overlays: + - Uncut-Edition-Dovetail + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bUncut\b' + + Uncut-Edition-Dovetail: + template: + - name: Edition + weight: 80 slug: uncut + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Uncut-Edition plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bUncut\b' + filepath.regex: 'edition-(?i)\bUncut\b' Unrated-Edition: template: - - name: SpecialRelease - weight: 60 + - name: Edition + weight: 70 slug: unrated + overlay: Unrated-Edition + suppress_overlays: + - Unrated-Edition-Dovetail plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bUnrated\b' + filepath.regex: 'edition-(?i)\bUnrated\b' + + Unrated-Edition-Dovetail: + template: + - name: Edition + weight: 70 + slug: unrated + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Unrated-Edition + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bUnrated\b' Special-Edition: template: - - name: SpecialRelease - weight: 50 + - name: Edition + weight: 60 slug: special + overlay: Special-Edition + suppress_overlays: + - Special-Edition-Dovetail + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bSpecial\b' + + Special-Edition-Dovetail: + template: + - name: Edition + weight: 60 + slug: special + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Special-Edition + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bSpecial\b' + + Final-Cut: + template: + - name: Edition + weight: 50 + slug: finalcut + overlay: Final-Cut + suppress_overlays: + - Final-Cut-Dovetail plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bSpecial\b' + filepath.regex: 'edition-(?i)\bFinal Cut\b' + + Final-Cut-Dovetail: + template: + - name: Edition + weight: 50 + slug: finalcut + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Final-Cut + plex_all: true + filters: + filepath.regex: 'edition-(?i)\bFinal Cut\b' IMAX-E: template: - - name: SpecialRelease + - name: Edition + weight: 40 + slug: enhanced + overlay: IMAX-E + suppress_overlays: + - IMAX-E-Dovetail + plex_all: true + filters: + filepath.regex: '(?i)\bIMAX Enhanced\b|^(?=.*(DSNP|Disney\+|CORE(?=[ ._-]web[ ._-]?(dl|rip)\b)|\bBC(?=[ ._-]web[ ._-]?(dl|rip)\b)|IMAX[- .]Enhanced)\b)(?=.*\b(IMAX|IMAX[- .]Enhanced)\b).*' + + IMAX-E-Dovetail: + template: + - name: Edition weight: 40 slug: enhanced + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: IMAX-E plex_all: true filters: filepath.regex: '(?i)\bIMAX Enhanced\b|^(?=.*(DSNP|Disney\+|CORE(?=[ ._-]web[ ._-]?(dl|rip)\b)|\bBC(?=[ ._-]web[ ._-]?(dl|rip)\b)|IMAX[- .]Enhanced)\b)(?=.*\b(IMAX|IMAX[- .]Enhanced)\b).*' IMAX: template: - - name: SpecialRelease + - name: Edition weight: 30 slug: imax + overlay: IMAX + suppress_overlays: + - IMAX-Dovetail plex_all: true filters: filepath.regex: '(?i)\bIMAX\b' - Criterion: + IMAX-Dovetail: + template: + - name: Edition + weight: 30 + slug: imax + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: IMAX + plex_all: true + filters: + filepath.regex: '(?i)\bIMAX\b' + + Remastered: template: - - name: SpecialRelease + - name: Edition weight: 20 - slug: criterion + slug: remastered + overlay: Remastered + suppress_overlays: + - Remastered-Dovetail plex_all: true filters: - filepath.regex: - - '(?i)Criterion' - - '(?i)\[CC\]' + filepath.regex: 'edition-(?i)\bRemastered\b' - Final-Cut: + Remastered-Dovetail: template: - - name: SpecialRelease - weight: 15 - slug: finalcut + - name: Edition + weight: 20 + slug: remastered + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Remastered plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bFinal Cut\b' + filepath.regex: 'edition-(?i)\bRemastered\b' - Remastered: + Criterion: template: - - name: SpecialRelease + - name: Edition weight: 10 - slug: remastered + slug: criterion + suppress_overlays: + - Criterion-Dovetail plex_all: true filters: - filepath.regex: '(?<=[0-9]{4}[)}>\]]\s)\bRemaster\b' + filepath.regex: + - "(?i)Criterion" + - '(?i)\[CC\]' + Criterion-Dovetail: + template: + - name: Edition + weight: 10 + slug: criterion + extra: '' + vertical_offset: 99 + group: Dovetail + overlay: Criterion + plex_all: true + filters: + filepath.regex: + - "(?i)Criterion" + - '(?i)\[CC\]' \ No newline at end of file From 532a7e6ddfa73a1909e911adaf789c57d6d72d80 Mon Sep 17 00:00:00 2001 From: bullmoose20 Date: Fri, 23 Sep 2022 12:43:10 -0400 Subject: [PATCH 2/2] updated regex --- PMM/overlays/special_release.yml | 59 +++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/PMM/overlays/special_release.yml b/PMM/overlays/special_release.yml index 6ffae9c..0a3f2f8 100644 --- a/PMM/overlays/special_release.yml +++ b/PMM/overlays/special_release.yml @@ -80,7 +80,9 @@ overlays: - Directors-Cut-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bDirector|Directors\b' + filepath.regex: + - 'edition-(?i)\b(Director|Directors)\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\b(Director|Directors)\b' # Original TRaSH naming Directors-Cut-Dovetail: template: @@ -93,7 +95,9 @@ overlays: overlay: Directors-Cut plex_all: true filters: - filepath.regex: 'edition-(?i)\bDirector|Directors\b' + filepath.regex: + - 'edition-(?i)\b(Director|Directors)\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\b(Director|Directors)\b' # Original TRaSH naming Extended-Edition: template: @@ -105,7 +109,9 @@ overlays: - Extended-Edition-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bExtended\b' + filepath.regex: + - 'edition-(?i)\bExtended\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bExtended\b' # Original TRaSH naming Extended-Edition-Dovetail: template: @@ -118,7 +124,9 @@ overlays: overlay: Extended-Edition plex_all: true filters: - filepath.regex: 'edition-(?i)\bExtended\b' + filepath.regex: + - 'edition-(?i)\bExtended\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bExtended\b' # Original TRaSH naming Uncut-Edition: template: @@ -130,7 +138,9 @@ overlays: - Uncut-Edition-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bUncut\b' + filepath.regex: + - 'edition-(?i)\bUncut\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bUncut\b' # Original TRaSH naming Uncut-Edition-Dovetail: template: @@ -143,7 +153,9 @@ overlays: overlay: Uncut-Edition plex_all: true filters: - filepath.regex: 'edition-(?i)\bUncut\b' + filepath.regex: + - 'edition-(?i)\bUncut\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bUncut\b' # Original TRaSH naming Unrated-Edition: template: @@ -155,7 +167,9 @@ overlays: - Unrated-Edition-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bUnrated\b' + filepath.regex: + - 'edition-(?i)\bUnrated\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bUnrated\b' # Original TRaSH naming Unrated-Edition-Dovetail: template: @@ -168,7 +182,9 @@ overlays: overlay: Unrated-Edition plex_all: true filters: - filepath.regex: 'edition-(?i)\bUnrated\b' + filepath.regex: + - 'edition-(?i)\bUnrated\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bUnrated\b' # Original TRaSH naming Special-Edition: template: @@ -180,7 +196,9 @@ overlays: - Special-Edition-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bSpecial\b' + filepath.regex: + - 'edition-(?i)\bSpecial\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bSpecial\b' # Original TRaSH naming Special-Edition-Dovetail: template: @@ -193,7 +211,9 @@ overlays: overlay: Special-Edition plex_all: true filters: - filepath.regex: 'edition-(?i)\bSpecial\b' + filepath.regex: + - 'edition-(?i)\bSpecial\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bSpecial\b' # Original TRaSH naming Final-Cut: template: @@ -205,7 +225,9 @@ overlays: - Final-Cut-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bFinal Cut\b' + filepath.regex: + - 'edition-(?i)\bFinal\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bFinal\b' # Original TRaSH naming Final-Cut-Dovetail: template: @@ -218,7 +240,9 @@ overlays: overlay: Final-Cut plex_all: true filters: - filepath.regex: 'edition-(?i)\bFinal Cut\b' + filepath.regex: + - 'edition-(?i)\bFinal\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)\bFinal\b' # Original TRaSH naming IMAX-E: template: @@ -280,7 +304,9 @@ overlays: - Remastered-Dovetail plex_all: true filters: - filepath.regex: 'edition-(?i)\bRemastered\b' + filepath.regex: + - 'edition-(?i)\b(Remaster|Remastered|4k Remaster|4k Remastered)\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)(?i)\b(Remaster|Remastered|4k Remaster|4k Remastered)\b' # Original TRaSH naming Remastered-Dovetail: template: @@ -293,7 +319,8 @@ overlays: overlay: Remastered plex_all: true filters: - filepath.regex: 'edition-(?i)\bRemastered\b' + - 'edition-(?i)\b(Remaster|Remastered|4k Remaster|4k Remastered)\b' # New TRaSH naming + - '(?<=[0-9]{4}[)}>\]]\s)(?i)\b(Remaster|Remastered|4k Remaster|4k Remastered)\b' # Original TRaSH naming Criterion: template: @@ -305,7 +332,7 @@ overlays: plex_all: true filters: filepath.regex: - - "(?i)Criterion" + - '(?i)Criterion' - '(?i)\[CC\]' Criterion-Dovetail: @@ -320,5 +347,5 @@ overlays: plex_all: true filters: filepath.regex: - - "(?i)Criterion" + - '(?i)Criterion' - '(?i)\[CC\]' \ No newline at end of file