tweak(regex): Change HMAX Regex

custom_formats/HMAX.yml

@@ -7,12 +7,7 @@ conditions:
 - name: HMAX Regex
   negate: false
   pattern: HBO Max
-  required: false
-  type: release_title
-- name: HMAX Rename Regex
-  negate: false
-  pattern: HBO Max Rename
-  required: false
+  required: true
   type: release_title
 - name: WEB-DL
   negate: false
@@ -20,10 +15,10 @@ conditions:
   source: web_dl
   type: source
 - name: WEBRip
-  type: source
-  required: false
   negate: false
+  required: false
   source: webrip
+  type: source
 tests:
 - conditionResults:
   - matches: true

regex_patterns/HBO Max Rename.yml

@@ -1,74 +0,0 @@
-name: HBO Max Rename
-pattern: \[(HMAX)\b|\b(HMAX)\]
-description: HBO Max is an American subscription video-on-demand streaming service
-  that offers a range of original programming and content from WarnerMedia's vast
-  library, encompassing brands such as Warner Bros., CNN, Cartoon Network, TBS, and
-  Turner Classic Movies. In mid-to-late 2023, HBO Max underwent a rebranding to "Max".
-tags:
-- Streaming Service
-- WEB-DL
-tests:
-- expected: true
-  id: 1
-  input: The Many Saints of Newark 2021 1080p HBOMAX WEBRiP x264 WAV-CREATiVE24
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 43
-    start: 37
-  matchedContent: HBOMAX
-  matchedGroups:
-  - HBOMAX
-  - RiP
-  passes: true
-- expected: true
-  id: 2
-  input: Looney Tunes Cartoons S04 1080p HBOM WEB-DL DD5.1 H.264-NTb
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 36
-    start: 32
-  matchedContent: HBOM
-  matchedGroups:
-  - HBOM
-  - DL
-  passes: true
-- expected: true
-  id: 3
-  input: 12 oz Mouse S01 1080p HBOMax WEB-DL DDP2 x264-Mr Lahey
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 28
-    start: 22
-  matchedContent: HBOMax
-  matchedGroups:
-  - HBOMax
-  - DL
-  passes: true
-- expected: true
-  id: 4
-  input: Silicon Valley S01 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 29
-    start: 25
-  matchedContent: HMAX
-  matchedGroups:
-  - HMAX
-  - DL
-  passes: true
-- expected: false
-  id: 5
-  input: A Discovery of Witches S03 1080p HBO WEB-DL AAC 2.0 H.264
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
-- expected: false
-  id: 6
-  input: The Yin Yang Master Zero 2024 1080p BluRay REMUX AVC DTS-HD MA 7 1-HBO
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true

regex_patterns/HBO Max.yml

@@ -1,5 +1,5 @@
 name: HBO Max
-pattern: \b(hmax|hbom|hbo[ ._-]?max)\b(?=[ ._-]web[ ._-]?(dl|rip)\b)
+pattern: \b(?:HMAX|HBOM|(?:HBO[ ._-]?MAX)(?=\s*.(?:WEB-?DL|WEBRIP)))\b
 description: HBO Max is an American subscription video-on-demand streaming service
   that offers a range of original programming and content from WarnerMedia's vast
   library, encompassing brands such as Warner Bros., CNN, Cartoon Network, TBS, and
@@ -8,67 +8,21 @@ tags:
 - Streaming Service
 - WEB-DL
 tests:
-- expected: true
-  id: 1
+- id: 1
   input: The Many Saints of Newark 2021 1080p HBOMAX WEBRiP x264 WAV-CREATiVE24
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 43
-    start: 37
-  matchedContent: HBOMAX
-  matchedGroups:
-  - HBOMAX
-  - RiP
-  passes: true
-- expected: true
-  id: 2
+  expected: true
+- id: 2
   input: Looney Tunes Cartoons S04 1080p HBOM WEB-DL DD5.1 H.264-NTb
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 36
-    start: 32
-  matchedContent: HBOM
-  matchedGroups:
-  - HBOM
-  - DL
-  passes: true
-- expected: true
-  id: 3
+  expected: true
+- id: 3
   input: 12 oz Mouse S01 1080p HBOMax WEB-DL DDP2 x264-Mr Lahey
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 28
-    start: 22
-  matchedContent: HBOMax
-  matchedGroups:
-  - HBOMax
-  - DL
-  passes: true
-- expected: true
-  id: 4
+  expected: true
+- id: 4
   input: Silicon Valley S01 1080p HMAX WEB-DL DD5 1 H 264-PHOENiX
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan:
-    end: 29
-    start: 25
-  matchedContent: HMAX
-  matchedGroups:
-  - HMAX
-  - DL
-  passes: true
-- expected: false
-  id: 5
+  expected: true
+- id: 5
   input: A Discovery of Witches S03 1080p HBO WEB-DL AAC 2.0 H.264
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
-- expected: false
-  id: 6
+  expected: false
+- id: 6
   input: The Yin Yang Master Zero 2024 1080p BluRay REMUX AVC DTS-HD MA 7 1-HBO
-  lastRun: '2024-12-06T04:48:56.790473'
-  matchSpan: null
-  matchedContent: null
-  matchedGroups: []
-  passes: true
+  expected: false