fix(format): HDR improvements (#50)

- fixed a issue where HDR was matching both HDR10 & 10+
- fixed an issue where unknown lossless audio was matching for TrueHD releases / missing groups
- added a new 'general HDR' CF which matches HDR that isn't HDR10 nor HDR10+
- added an optional any character between HDR10 and +

custom_formats/HDR.yml

@@ -0,0 +1,22 @@
+name: HDR
+description: Matches the 'HDR' Regex Pattern
+tags:
+- Colour Grade
+- HDR
+conditions:
+- name: HDR
+  negate: false
+  pattern: HDR
+  required: true
+  type: release_title
+- name: Not HDR10
+  type: release_title
+  required: true
+  negate: true
+  pattern: HDR10
+- name: Not HDR10+
+  type: release_title
+  required: true
+  negate: true
+  pattern: HDR10+
+tests: []

custom_formats/HDR10 (Missing) (1080p).yml

@@ -4,6 +4,11 @@ tags:
 - Colour Grade
 - HDR
 conditions:
+- name: Blu-ray
+  type: source
+  required: true
+  negate: false
+  source: bluray
 - name: 1080p
   negate: false
   required: true
@@ -34,4 +39,9 @@ conditions:
   pattern: HDR10
   required: true
   type: release_title
+- name: Not HDR
+  negate: true
+  pattern: HDR
+  required: true
+  type: release_title
 tests: []

custom_formats/HDR10 (Missing).yml

@@ -1,19 +1,20 @@
 name: HDR10 (Missing)
-description: Attempts to match HDR10 to groups that mislabel their releases
+description: Attempts to match HDR10 to groups that mislabel their releases. *This
+  does not work properly in sonarr.*
 tags:
 - Colour Grade
 - HDR
 conditions:
+- name: Blu-ray
+  negate: false
+  required: true
+  source: bluray
+  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
-- name: Blu-ray
-  type: source
-  required: true
-  negate: false
-  source: bluray
 - name: Not HDR10
   negate: true
   pattern: HDR10
@@ -29,6 +30,11 @@ conditions:
   pattern: SDR
   required: true
   type: release_title
+- name: Not HDR
+  type: release_title
+  required: true
+  negate: true
+  pattern: HDR
 tests:
 - conditionResults:
   - matches: false

custom_formats/HDR10.yml

@@ -9,4 +9,9 @@ conditions:
   pattern: HDR10
   required: true
   type: release_title
+- name: Not HDR10+
+  type: release_title
+  required: true
+  negate: true
+  pattern: HDR10+
 tests: []

custom_formats/SDR.yml

@@ -5,28 +5,33 @@ tags:
 - HDR
 conditions:
 - name: 2160p
-  type: resolution
-  required: true
   negate: false
+  required: true
   resolution: 2160p
+  type: resolution
 - name: WEB-DL
-  type: source
-  required: true
   negate: false
-  source: web_dl
-- name: Not HDR10+
-  type: release_title
   required: true
+  source: web_dl
+  type: source
+- name: Not HDR10+
   negate: true
   pattern: HDR10+
-- name: Not Dolby Vision
-  type: release_title
   required: true
+  type: release_title
+- name: Not Dolby Vision
   negate: true
   pattern: Dolby Vision
+  required: true
+  type: release_title
 - name: Not HDR10
   negate: true
   pattern: HDR10
   required: true
   type: release_title
+- name: Not HDR
+  type: release_title
+  required: true
+  negate: true
+  pattern: HDR
 tests: []

custom_formats/Unknown Lossless Audio.yml

@@ -6,25 +6,25 @@ tags:
 - Audio
 conditions:
 - name: 2160p
-  type: resolution
-  required: true
   negate: false
+  required: true
   resolution: 2160p
+  type: resolution
 - name: Blu-ray
-  type: source
-  required: true
   negate: false
-  source: bluray
-- name: Not DTS-HD MA
-  type: release_title
   required: true
+  source: bluray
+  type: source
+- name: Not DTS-HD MA
   negate: true
   pattern: DTS-HD MA
-- name: Not DTS-X
-  type: release_title
   required: true
+  type: release_title
+- name: Not DTS-X
   negate: true
   pattern: DTS-X
+  required: true
+  type: release_title
 - name: Not FLAC
   negate: true
   pattern: FLAC
@@ -45,9 +45,9 @@ conditions:
   pattern: DTS
   required: true
   type: release_title
-- name: Not TrueHD + Atmos
+- name: Not TrueHD
   negate: true
-  pattern: TrueHD + Atmos
+  pattern: TrueHD
   required: true
   type: release_title
 - name: Not Dolby Digital
@@ -60,4 +60,9 @@ conditions:
   pattern: Dolby Digital +
   required: true
   type: release_title
+- name: Not Missing Group
+  type: release_title
+  required: true
+  negate: true
+  pattern: TrueHD (Missing Groups)
 tests: []