From ff792f6bc48854af6fbef2c4efe7bea2f3cc3c9f Mon Sep 17 00:00:00 2001
From: Seraphys <xshatterx@protonmail.com>
Date: Sun, 19 Oct 2025 10:24:05 -0500
Subject: [PATCH] tweak(regex): Simplify Atmos

---
 custom_formats/Dolby Atmos.yml |  4 +--
 regex_patterns/Atmos.yml       | 44 ++++++----------------------
 regex_patterns/BTN Atmos.yml   | 53 +++++++---------------------------
 regex_patterns/Dolby Atmos.yml | 34 ----------------------
 4 files changed, 22 insertions(+), 113 deletions(-)
 delete mode 100644 regex_patterns/Dolby Atmos.yml

diff --git a/custom_formats/Dolby Atmos.yml b/custom_formats/Dolby Atmos.yml
index 49dbd4e..df55416 100644
--- a/custom_formats/Dolby Atmos.yml	
+++ b/custom_formats/Dolby Atmos.yml	
@@ -4,9 +4,9 @@ tags:
 - Audio
 - Dolby
 conditions:
-- name: Dolby Atmos
+- name: Atmos
   negate: false
-  pattern: Dolby Atmos
+  pattern: Atmos
   required: true
   type: release_title
 - name: Not TrueHD
diff --git a/regex_patterns/Atmos.yml b/regex_patterns/Atmos.yml
index 50eada5..3aac28f 100644
--- a/regex_patterns/Atmos.yml
+++ b/regex_patterns/Atmos.yml
@@ -1,45 +1,19 @@
 name: Atmos
-pattern: \bATMOS(\b|\d)
+pattern: \bATMOS|DDPA(\b|\d)
 description: ''
 tags:
 - Audio
 - Enhancement
 tests:
-- expected: false
-  id: 1
+- id: 1
   input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP
-  lastRun: '2025-01-06T15:07:07.378833'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
-- expected: true
-  id: 2
+  expected: false
+- id: 2
   input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR
-  lastRun: '2025-01-06T15:07:07.378833'
-  matchSpan:
-    end: 48
-    start: 43
-  matchedContent: Atmos
-  matchedGroups:
-  - ''
-  passes: true
-- expected: true
-  id: 3
+  expected: true
+- id: 3
   input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX
-  lastRun: '2025-01-06T15:07:07.378833'
-  matchSpan:
-    end: 49
-    start: 44
-  matchedContent: Atmos
-  matchedGroups:
-  - ''
-  passes: true
-- expected: false
-  id: 4
+  expected: true
+- id: 4
   input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX
-  lastRun: '2025-01-06T15:07:07.378833'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
+  expected: true
diff --git a/regex_patterns/BTN Atmos.yml b/regex_patterns/BTN Atmos.yml
index ee6283f..8847ccc 100644
--- a/regex_patterns/BTN Atmos.yml	
+++ b/regex_patterns/BTN Atmos.yml	
@@ -1,52 +1,21 @@
 name: BTN Atmos
-pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1|DDPA[57]\.1\b
+pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1
 description: Matches BroadcastTheNet Atmos naming convention
 tags:
 - Audio
 tests:
-- expected: true
-  id: 1
+- id: 1
   input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP
-  lastRun: '2025-01-11T23:15:36.540509'
-  matchSpan:
-    end: 52
-    start: 42
-  matchedContent: TrueHDA7.1
-  matchedGroups: []
-  passes: true
-- expected: false
-  id: 2
+  expected: true
+- id: 2
   input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR
-  lastRun: '2025-01-11T23:15:36.540509'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
-- expected: false
-  id: 3
+  expected: false
+- id: 3
   input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX
-  lastRun: '2025-01-11T23:15:36.540509'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
-- expected: true
-  id: 4
+  expected: false
+- id: 4
   input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX
-  lastRun: '2025-01-11T23:15:36.540509'
-  matchSpan:
-    end: 50
-    start: 43
-  matchedContent: DDPA5.1
-  matchedGroups: []
-  passes: true
-- expected: true
-  id: 5
+  expected: false
+- id: 5
   input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI
-  lastRun: '2025-01-11T23:15:36.540509'
-  matchSpan:
-    end: 43
-    start: 32
-  matchedContent: TrueHDA.7.1
-  matchedGroups: []
-  passes: true
+  expected: true
diff --git a/regex_patterns/Dolby Atmos.yml b/regex_patterns/Dolby Atmos.yml
deleted file mode 100644
index 16596d7..0000000
--- a/regex_patterns/Dolby Atmos.yml	
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Dolby Atmos
-pattern: \bATMOS(\b|\d)|\bDDPA[57]\.1\b
-description: ''
-tags:
-- Audio
-- Enhancement
-tests:
-- id: 1
-  input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP
-  expected: false
-- id: 2
-  input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR
-  expected: true
-- id: 3
-  input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX
-  expected: true
-- id: 4
-  input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX
-  expected: true
-- id: 5
-  input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP
-  expected: false
-- id: 6
-  input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR
-  expected: true
-- id: 7
-  input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX
-  expected: true
-- id: 8
-  input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX
-  expected: true
-- id: 9
-  input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI
-  expected: false