From 7da522f2f8e2b4bd9543c01de660591253cc39b2 Mon Sep 17 00:00:00 2001
From: Minwei Xu <faceswilliam@gmail.com>
Date: Tue, 21 May 2024 06:10:18 -0400
Subject: [PATCH] Simplify criterion regex in resolution overlays

No need for 2 separate regex for criterion
---
 defaults/overlays/resolution.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml
index da50a1ba..8ff0b1e1 100644
--- a/defaults/overlays/resolution.yml
+++ b/defaults/overlays/resolution.yml
@@ -159,18 +159,14 @@ external_templates:
 templates:
   edition:
     conditionals:
-      regex1:
+      regex:
         conditions:
           - key: enhanced
             value: '(?i)\bIMAX Enhanced\b|^(?=.*(DSNP|Disney\+|CORE(?=[ ._-]web[ ._-]?(dl|rip)\b)|\bBC(?=[ ._-]web[ ._-]?(dl|rip)\b)|IMAX[- .]Enhanced)\b)(?=.*\b(IMAX|IMAX[- .]Enhanced)\b).*'
           - key: imax
             value: '(?i)\bIMAX\b'
           - key: criterion
-            value: '(?i)Criterion'
-      regex2:
-        conditions:
-          - key: criterion
-            value: '(?i)\[CC\]'
+            value: '(?i)Criterion|\[CC\]'
     optional:
       - search
       - use_<<key>>
@@ -185,8 +181,7 @@ templates:
     filters:
       - edition: <<search>>
       - filepath.regex:
-        - <<regex1>>
-        - <<regex2>>
+        - <<regex>>
         - '(?i)edition-\b(4k )?<<search>>(s|ed)?\b'           # New TRaSH naming
         - '(?<=[0-9]{4}[)}>\]]\s)\b(4k )?<<search>>(s|ed)?\b' # Original TRaSH naming