From 115d763bbb9da43fd0cd195bdb1264eaa329c640 Mon Sep 17 00:00:00 2001
From: yammes08 <111231042+yammes08@users.noreply.github.com>
Date: Thu, 16 Nov 2023 00:31:53 +0000
Subject: [PATCH 1/3] Custom Format Conditional Changes

- Removed `HDR` and `Not SDR` conditionals from 2160p custom formats
- Added release group conditionals back to TrueHD Atmos custom format for Radarr only (note, this is a partial reversion of #1553
---
 docs/json/radarr/cf/2160p.json        | 18 ------------------
 docs/json/radarr/cf/truehd-atmos.json |  4 ++--
 docs/json/sonarr/cf/2160p.json        | 18 ------------------
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/docs/json/radarr/cf/2160p.json b/docs/json/radarr/cf/2160p.json
index 8b6e3c38d..353f041be 100644
--- a/docs/json/radarr/cf/2160p.json
+++ b/docs/json/radarr/cf/2160p.json
@@ -18,24 +18,6 @@
       "fields": {
         "value": 2160
       }
-    },
-    {
-      "name": "HDR Formats",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?v(ision)?)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b|\\b(HLG)\\b"
-      }
-    },
-    {
-      "name": "NOT SDR",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": true,
-      "required": true,
-      "fields": {
-        "value": "\\bSDR\\b"
-      }
     }
   ]
 }
diff --git a/docs/json/radarr/cf/truehd-atmos.json b/docs/json/radarr/cf/truehd-atmos.json
index ee8214f18..5e4073746 100644
--- a/docs/json/radarr/cf/truehd-atmos.json
+++ b/docs/json/radarr/cf/truehd-atmos.json
@@ -14,7 +14,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "True[ .-]?HD"
+        "value": "True[ .-]?HD|W4NK3R|HQMUX"
       }
     },
     {
@@ -23,7 +23,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\bATMOS(\\b|\\d)"
+        "value": "\\b(ATMOS|W4NK3R|-DON)(\\b|\\d)"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/2160p.json b/docs/json/sonarr/cf/2160p.json
index f3ef68862..8933c4b1f 100644
--- a/docs/json/sonarr/cf/2160p.json
+++ b/docs/json/sonarr/cf/2160p.json
@@ -14,24 +14,6 @@
       "fields": {
         "value": 2160
       }
-    },
-    {
-      "name": "HDR Formats",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?v(ision)?)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b|\\b(HLG)\\b"
-      }
-    },
-    {
-      "name": "NOT SDR",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": true,
-      "required": true,
-      "fields": {
-        "value": "\\bSDR\\b"
-      }
     }
   ]
 }

From 4b337abb52f27e9c97f5a977d38bae6fc8dfd7d0 Mon Sep 17 00:00:00 2001
From: yammes08 <111231042+yammes08@users.noreply.github.com>
Date: Thu, 16 Nov 2023 09:10:09 +0000
Subject: [PATCH 2/3] Restored more conditionals

- Added release group conditionals back to `truehd` and `atmos (undefined)`
---
 docs/json/radarr/cf/atmos-undefined.json | 9 +++++++++
 docs/json/radarr/cf/truehd.json          | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/json/radarr/cf/atmos-undefined.json b/docs/json/radarr/cf/atmos-undefined.json
index d453e8aba..35f83a2a3 100644
--- a/docs/json/radarr/cf/atmos-undefined.json
+++ b/docs/json/radarr/cf/atmos-undefined.json
@@ -71,6 +71,15 @@
         "value": "\\b(l?)PCM(\\b|\\d)"
       }
     },
+    {
+      "name": "Not RlsGrp (Atmos Only)",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "W4NK3R|HQMUX"
+      }
+    },
     {
       "name": "Not TrueHD",
       "implementation": "ReleaseTitleSpecification",
diff --git a/docs/json/radarr/cf/truehd.json b/docs/json/radarr/cf/truehd.json
index aa215ff60..d013f00d3 100644
--- a/docs/json/radarr/cf/truehd.json
+++ b/docs/json/radarr/cf/truehd.json
@@ -61,6 +61,15 @@
       "fields": {
         "value": "\\bDD[^a-z+]|(?<!e)ac3"
       }
+    },
+    {
+      "name": "Not RlsGrp (TrueHD only)",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "CtrlHD|W4NK3R|-DON"
+      }
     }
   ]
 }

From 105dc79dd6ee7a0c82693fab0ba7a3c13cb2d232 Mon Sep 17 00:00:00 2001
From: yammes08 <111231042+yammes08@users.noreply.github.com>
Date: Thu, 16 Nov 2023 17:17:10 +0000
Subject: [PATCH 3/3] Amended regexes and strings

- Fix regexes and match strings as per offline review
---
 docs/json/radarr/cf/atmos-undefined.json | 2 +-
 docs/json/radarr/cf/truehd-atmos.json    | 2 +-
 docs/json/radarr/cf/truehd.json          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/json/radarr/cf/atmos-undefined.json b/docs/json/radarr/cf/atmos-undefined.json
index 35f83a2a3..134d1c7e2 100644
--- a/docs/json/radarr/cf/atmos-undefined.json
+++ b/docs/json/radarr/cf/atmos-undefined.json
@@ -77,7 +77,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "W4NK3R|HQMUX"
+        "value": "\\b(W4NK3R|HQMUX)\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/truehd-atmos.json b/docs/json/radarr/cf/truehd-atmos.json
index 5e4073746..c9a44b0a1 100644
--- a/docs/json/radarr/cf/truehd-atmos.json
+++ b/docs/json/radarr/cf/truehd-atmos.json
@@ -23,7 +23,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(ATMOS|W4NK3R|-DON)(\\b|\\d)"
+        "value": "\\b(ATMOS|W4NK3R|DON)(\\b|\\d)"
       }
     },
     {
diff --git a/docs/json/radarr/cf/truehd.json b/docs/json/radarr/cf/truehd.json
index d013f00d3..2039aa06e 100644
--- a/docs/json/radarr/cf/truehd.json
+++ b/docs/json/radarr/cf/truehd.json
@@ -68,7 +68,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "CtrlHD|W4NK3R|-DON"
+        "value": "\\b(CtrlHD|W4NK3R|DON)\\b"
       }
     }
   ]