From 532a7e6ddfa73a1909e911adaf789c57d6d72d80 Mon Sep 17 00:00:00 2001
From: bullmoose20 <nick.zampieri@hotmail.com>
Date: Fri, 23 Sep 2022 12:43:10 -0400
Subject: [PATCH] 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