From 3bb2448b57b813c6e07aa35caefdbe34abf78f3e Mon Sep 17 00:00:00 2001
From: Kyle McClain <76190687+bedynamictech@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:27:50 -0700
Subject: [PATCH] Fixed HDR

---
 regex_patterns/HDR.yml    |   2 +-
 regex_patterns/HDR10+.yml | 195 +++++++++++++++---------------
 regex_patterns/HDR10.yml  | 243 +++++++++++++++++---------------------
 3 files changed, 209 insertions(+), 231 deletions(-)

diff --git a/regex_patterns/HDR.yml b/regex_patterns/HDR.yml
index e997c66..b6999a6 100644
--- a/regex_patterns/HDR.yml
+++ b/regex_patterns/HDR.yml
@@ -92,4 +92,4 @@ tests:
   matchSpan: null
   matchedContent: null
   matchedGroups: []
-  passes: true
\ No newline at end of file
+  passes: true
diff --git a/regex_patterns/HDR10+.yml b/regex_patterns/HDR10+.yml
index 8c33f32..dc8e75a 100644
--- a/regex_patterns/HDR10+.yml
+++ b/regex_patterns/HDR10+.yml
@@ -5,126 +5,127 @@ description: This regex matches `HDR10` when followed by either a plus sign `+`,
 tags:
 - Enhancement
 - Colour Grade
-@@ -13,129 +10,132 @@ tests:
+- HDR
+tests:
 - expected: false
-id: 1
-input: HDR
+  id: 1
+  input: HDR
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: false
-id: 2
-input: HDR+
+  id: 2
+  input: HDR+
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: false
-id: 3
-input: HDR10
+  id: 3
+  input: HDR10
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: true
-id: 4
-input: HDR10+
+  id: 4
+  input: HDR10+
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 6
-start: 0
-matchedContent: HDR10+
-matchedGroups:
-- +
-- null
-passes: true
+  matchSpan:
+    end: 6
+    start: 0
+  matchedContent: HDR10+
+  matchedGroups:
+  - +
+  - null
+  passes: true
 - expected: false
-id: 5
-input: HLG HDR
+  id: 5
+  input: HLG HDR
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: false
-id: 6
-input: SDR HDR
+  id: 6
+  input: SDR HDR
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: false
-id: 7
-input: PQ HDR
+  id: 7
+  input: PQ HDR
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: true
-id: 8
-input: HDR10P
+  id: 8
+  input: HDR10P
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 6
-start: 0
-matchedContent: HDR10P
-matchedGroups:
-- P
-- null
-passes: true
+  matchSpan:
+    end: 6
+    start: 0
+  matchedContent: HDR10P
+  matchedGroups:
+  - P
+  - null
+  passes: true
 - expected: true
-id: 9
-input: HDR10Plus
+  id: 9
+  input: HDR10Plus
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 9
-start: 0
-matchedContent: HDR10Plus
-matchedGroups:
-- Plus
-- lus
-passes: true
+  matchSpan:
+    end: 9
+    start: 0
+  matchedContent: HDR10Plus
+  matchedGroups:
+  - Plus
+  - lus
+  passes: true
 - expected: true
-id: 10
-input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+ TrueHD
-Atmos 7.1 English-WiLDCAT
+  id: 10
+  input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+ TrueHD
+    Atmos 7.1 English-WiLDCAT
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 68
-start: 62
-matchedContent: HDR10+
-matchedGroups:
-- +
-- null
-passes: true
+  matchSpan:
+    end: 68
+    start: 62
+  matchedContent: HDR10+
+  matchedGroups:
+  - +
+  - null
+  passes: true
 - expected: true
-id: 11
-input: La Maison S01 REPACK 2160p ATVP WEB-DL Dual-Audio DD+ 5.1 Atmos DV HDR10+
-H.265-Kitsune
+  id: 11
+  input: La Maison S01 REPACK 2160p ATVP WEB-DL Dual-Audio DD+ 5.1 Atmos DV HDR10+
+    H.265-Kitsune
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 73
-start: 67
-matchedContent: HDR10+
-matchedGroups:
-- +
-- null
-passes: true
+  matchSpan:
+    end: 73
+    start: 67
+  matchedContent: HDR10+
+  matchedGroups:
+  - +
+  - null
+  passes: true
 - expected: false
-id: 12
-input: Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray DoVi
-HDR10 HEVC TrueHD 7.1 Atmos-ANKO
+  id: 12
+  input: Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray DoVi
+    HDR10 HEVC TrueHD 7.1 Atmos-ANKO
   lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: true
   id: 13
   input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10 Plus
@@ -137,4 +138,4 @@ passes: true
   matchedGroups:
   - Plus
   - lus
-  passes: true
\ No newline at end of file
+  passes: true
diff --git a/regex_patterns/HDR10.yml b/regex_patterns/HDR10.yml
index 5dd2e68..213d30d 100644
--- a/regex_patterns/HDR10.yml
+++ b/regex_patterns/HDR10.yml
@@ -1,139 +1,116 @@
-name: HDR10+
-pattern: \bHDR10.?(\+|P(lus)?\b)
-description: This regex matches `HDR10` when followed by either a plus sign `+`, `P`,
-  or `Plus`
+name: HDR10
+pattern: \bHDR10(?!\+|Plus)\b
+description: 'This regex matches `HDR10` only when it *is not* followed by any HDR
+  format specifiers like `+`, or `Plus`. '
 tags:
 - Enhancement
 - Colour Grade
+- HDR
+tests:
 - expected: false
-id: 1
-input: HDR
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
-- expected: false
-id: 2
-input: HDR+
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
-- expected: false
-id: 3
-input: HDR10
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
+  id: 2
+  input: HDR+
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
 - expected: true
-id: 4
-input: HDR10+
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 6
-start: 0
-matchedContent: HDR10+
-matchedGroups:
-- +
-- null
-passes: true
-- expected: false
-id: 5
-input: HLG HDR
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
-- expected: false
-id: 6
-input: SDR HDR
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
-- expected: false
-id: 7
-input: PQ HDR
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
-- expected: true
-id: 8
-input: HDR10P
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 6
-start: 0
-matchedContent: HDR10P
-matchedGroups:
-- P
-- null
-passes: true
-- expected: true
-id: 9
-input: HDR10Plus
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 9
-start: 0
-matchedContent: HDR10Plus
-matchedGroups:
-- Plus
-- lus
-passes: true
-- expected: true
-id: 10
-input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+ TrueHD
-Atmos 7.1 English-WiLDCAT
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 68
-start: 62
-matchedContent: HDR10+
-matchedGroups:
-- +
-- null
-passes: true
-- expected: true
-id: 11
-input: La Maison S01 REPACK 2160p ATVP WEB-DL Dual-Audio DD+ 5.1 Atmos DV HDR10+
-H.265-Kitsune
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan:
-end: 73
-start: 67
-matchedContent: HDR10+
-matchedGroups:
-- +
-- null
-passes: true
-- expected: false
-id: 12
-input: Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray DoVi
-HDR10 HEVC TrueHD 7.1 Atmos-ANKO
-  lastRun: '2025-04-05T09:25:21.372205'
-matchSpan: null
-matchedContent: null
-matchedGroups: []
-passes: true
-- expected: true
-  id: 13
-  input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10 Plus
-    TrueHD Atmos 7.1 English-WiLDCAT
-  lastRun: '2025-04-05T09:25:21.372205'
+  id: 3
+  input: HDR10
+  lastRun: '2025-04-02T20:01:38.732592'
   matchSpan:
-    end: 72
-    start: 62
-  matchedContent: HDR10 Plus
-  matchedGroups:
-  - Plus
-  - lus
-  passes: true
\ No newline at end of file
+    end: 5
+    start: 0
+  matchedContent: HDR10
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 4
+  input: HDR10+
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 5
+  input: HLG HDR
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 6
+  input: SDR HDR
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 7
+  input: PQ HDR
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 8
+  input: HDR10
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan:
+    end: 5
+    start: 0
+  matchedContent: HDR10
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 9
+  input: Barbie (2023) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR TrueHD Atmos 7.1
+    English-FraMeSToR
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 10
+  input: Game of Thrones (2011) S06 2160p UHD BluRay REMUX HEVC DV HDR TrueHD Atmos
+    7.1 English-FraMeSToR
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: true
+  id: 11
+  input: Liu lang di qiu 2 AKA The Wandering Earth II 2023 2160p CHN UHD Blu-ray DoVi
+    HDR10 HEVC TrueHD 7.1 Atmos-ANKO
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan:
+    end: 82
+    start: 77
+  matchedContent: HDR10
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 12
+  input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10+ TrueHD
+    Atmos 7.1 English-WiLDCAT
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true
+- expected: false
+  id: 13
+  input: Schindler's List (1993) 2160p UHD BluRay Hybrid REMUX HEVC DV HDR10P TrueHD
+    Atmos 7.1 English-WiLDCAT
+  lastRun: '2025-04-02T20:01:38.732592'
+  matchSpan: null
+  matchedContent: null
+  matchedGroups: []
+  passes: true