Merge pull request #113 from Dictionarry-Hub/dev

- Drop HHWEB to WEB-DL Tier 3 - Move TheFarm to WEB-DL Tier 1 - Ban UnKn0wn - Rank Weasley Webs - Seperate Hallowed and BHDStudio in 1080p
tweak(format): Drop HHWEB to WEB-DL Tier 3
2025-12-11 00:07:01 +00:00 · 2025-12-10 16:53:11 -06:00 · 2025-12-09 12:20:46 -06:00 · 2025-12-07 17:42:04 -06:00 · 2025-12-05 18:11:12 -06:00 · 2025-12-05 18:04:30 -06:00
28 changed files with 311 additions and 187 deletions
--- a/custom_formats/1080p
+++ b/custom_formats/1080p
@@ -15,16 +15,11 @@ conditions:
  required: true
  source: bluray
  type: source
- name: BHDStudio
-  negate: false
-  pattern: BHDStudio
-  required: false
-  type: release_group
 - name: hallowed
-  type: release_group
-  required: false
  negate: false
  pattern: hallowed
+  required: false
+  type: release_group
 tests:
 - conditionResults:
  - matches: true
--- a/custom_formats/1080p
+++ b/custom_formats/1080p
@@ -0,0 +1,96 @@
+name: 1080p Balanced Tier 2
+description: Matches release groups who fall under 1080p Balanced Tier 2
+tags:
+- Release Group Tier
+- 1080p
+- Balanced
+conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Bluray
+  negate: false
+  required: true
+  source: bluray
+  type: source
+- name: BHDStudio
+  negate: false
+  pattern: BHDStudio
+  required: false
+  type: release_group
+tests:
+- conditionResults:
+  - matches: true
+    name: hallowed
+    negate: false
+    pattern: hallowed
+    required: false
+    type: release_group
+  - matches: false
+    name: BHDStudio
+    negate: false
+    pattern: BHDStudio
+    required: false
+    type: release_group
+  expected: true
+  id: 1
+  input: Contact.1997.BluRay.1080p.DDP.5.1.x264-hallowed
+  lastRun: '2025-01-13T02:53:37.357699'
+  passes: true
+- conditionResults:
+  - matches: true
+    name: hallowed
+    negate: false
+    pattern: hallowed
+    required: false
+    type: release_group
+  - matches: false
+    name: BHDStudio
+    negate: false
+    pattern: BHDStudio
+    required: false
+    type: release_group
+  expected: true
+  id: 2
+  input: Gladiator.2000.Extended.Cut.UHD.BluRay.2160p.DDP.7.1.DV.HDR.x265-hallowed
+  lastRun: '2025-01-13T02:53:37.357699'
+  passes: true
+- conditionResults:
+  - matches: false
+    name: hallowed
+    negate: false
+    pattern: hallowed
+    required: false
+    type: release_group
+  - matches: true
+    name: BHDStudio
+    negate: false
+    pattern: BHDStudio
+    required: false
+    type: release_group
+  expected: true
+  id: 3
+  input: Yi Yi 2000 BluRay 720p DD 2 0 x264-BHDStudio
+  lastRun: '2025-01-13T02:53:37.357699'
+  passes: true
+- conditionResults:
+  - matches: false
+    name: hallowed
+    negate: false
+    pattern: hallowed
+    required: false
+    type: release_group
+  - matches: true
+    name: BHDStudio
+    negate: false
+    pattern: BHDStudio
+    required: false
+    type: release_group
+  expected: true
+  id: 4
+  input: Winnie the Pooh - Blood and Honey (2023) 2160p UHD BluRay x265 DV HDR DD
+    5.1 English-BHDStudio
+  lastRun: '2025-01-13T02:53:37.357699'
+  passes: true
--- a/custom_formats/ATV.yml
+++ b/custom_formats/ATV.yml
@@ -1,40 +0,0 @@
-name: ATV
-description: Matches 'Apple TV' WEB-DLs. Negates any encodes.
-tags:
- Streaming Service
- WEB-DL
-conditions:
- name: ATV Regex
-  negate: false
-  pattern: Apple TV
-  required: true
-  type: release_title
- name: WEB-DL
-  negate: false
-  required: false
-  source: web_dl
-  type: source
- name: WEBRip
-  negate: false
-  required: false
-  source: webrip
-  type: source
-tests:
- conditionResults:
-  - matches: true
-    name: APTV Regex
-    negate: false
-    pattern: Apple TV+
-    required: true
-    type: release_title
-  - matches: true
-    name: x265
-    negate: true
-    pattern: x265
-    required: false
-    type: release_title
-  expected: false
-  id: 2
-  input: Little America 2020 S01 1080p APTV Webrip x265 10bit EAC3 5 1 - Ainz
-  lastRun: '2024-12-03T02:27:03.531343'
-  passes: true
--- a/custom_formats/Amazon
+++ b/custom_formats/Amazon
@@ -11,6 +11,6 @@ conditions:
 - name: AMZN
  negate: false
  pattern: Amazon Prime
-  required: false
+  required: true
  type: release_title
 tests: []
--- a/custom_formats/Banned
+++ b/custom_formats/Banned
@@ -174,11 +174,16 @@ conditions:
  pattern: TvR
  required: false
  type: release_group
- name: VD0N
+- name: UnKn0wn
  type: release_group
  required: false
+  negate: false
+  pattern: UnKn0wn
+- name: VD0N
  negate: false
  pattern: VD0N
+  required: false
+  type: release_group
 - name: VECTOR
  negate: false
  pattern: VECTOR
--- a/custom_formats/Banned
+++ b/custom_formats/Banned
@@ -199,6 +199,11 @@ conditions:
  pattern: TvR
  required: false
  type: release_group
+- name: UnKn0wn
+  negate: false
+  pattern: UnKn0wn
+  required: false
+  type: release_group
 - name: VD0N
  negate: false
  pattern: VD0N
--- a/custom_formats/Disney+
+++ b/custom_formats/Disney+
@@ -0,0 +1,16 @@
+name: Disney+ Enhancement
+description: ''
+tags:
+- Enhancement
+conditions:
+- name: Not 2160p
+  negate: true
+  required: true
+  resolution: 2160p
+  type: resolution
+- name: DSNP
+  negate: false
+  pattern: Disney+
+  required: true
+  type: release_title
+tests: []
--- a/custom_formats/Movies
+++ b/custom_formats/Movies
@@ -0,0 +1,16 @@
+name: Movies Anywhere Enhancement
+description: ''
+tags:
+- Enhancement
+conditions:
+- name: Not 2160p
+  negate: true
+  required: true
+  resolution: 2160p
+  type: resolution
+- name: MA
+  negate: false
+  pattern: Movies Anywhere
+  required: true
+  type: release_title
+tests: []
--- a/custom_formats/WEB-DL
+++ b/custom_formats/WEB-DL
@@ -19,4 +19,9 @@ conditions:
  pattern: NTb
  required: false
  type: release_group
+- name: TheFarm
+  type: release_group
+  required: false
+  negate: false
+  pattern: TheFarm
 tests: []
--- a/custom_formats/WEB-DL
+++ b/custom_formats/WEB-DL
@@ -19,11 +19,6 @@ conditions:
  pattern: CMRG
  required: false
  type: release_group
- name: HHWEB
-  negate: false
-  pattern: HHWEB
-  required: false
-  type: release_group
 - name: HONE
  negate: false
  pattern: HONE
@@ -44,9 +39,4 @@ conditions:
  pattern: TEPES
  required: false
  type: release_group
- name: TheFarm
-  type: release_group
-  required: false
-  negate: false
-  pattern: TheFarm
 tests: []
--- a/custom_formats/WEB-DL
+++ b/custom_formats/WEB-DL
@@ -49,6 +49,11 @@ conditions:
  pattern: CtrlHD
  required: false
  type: release_group
+- name: HHWEB
+  type: release_group
+  required: false
+  negate: false
+  pattern: HHWEB
 - name: KHN
  negate: false
  pattern: KHN
--- a/custom_formats/Weasley
+++ b/custom_formats/Weasley
@@ -0,0 +1,25 @@
+name: Weasley WEB
+description: ''
+tags: []
+conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Weasley
+  negate: false
+  pattern: Weasley
+  required: true
+  type: release_title
+- name: WEB-DL
+  negate: false
+  required: false
+  source: web_dl
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
+tests: []
--- a/custom_formats/iTunes
+++ b/custom_formats/iTunes
@@ -11,6 +11,6 @@ conditions:
 - name: iT
  negate: false
  pattern: iTunes
-  required: false
+  required: true
  type: release_title
 tests: []
--- a/profiles/1080p
+++ b/profiles/1080p
@@ -22,6 +22,8 @@ upgradeUntilScore: 600000
 minScoreIncrement: 1
 custom_formats:
 - name: 1080p Balanced Tier 1
+  score: 281000
+- name: 1080p Balanced Tier 2
  score: 280000
 - name: 1080p WEB-DL
  score: 280000
@@ -77,16 +79,14 @@ custom_formats:
  score: 10000
 - name: AMZN
  score: 3000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
- name: ATV
-  score: 1000
 - name: iT
  score: 1000
 - name: NF
@@ -125,10 +125,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -155,6 +155,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision
  score: -999999
 - name: Full Disc
@@ -186,8 +188,6 @@ custom_formats_radarr:
  score: 4000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
--- a/profiles/1080p
+++ b/profiles/1080p
@@ -21,6 +21,8 @@ upgradeUntilScore: 600000
 minScoreIncrement: 1
 custom_formats:
 - name: 1080p Balanced Tier 1
+  score: 281000
+- name: 1080p Balanced Tier 2
  score: 280000
 - name: 1080p WEB-DL (h264)
  score: 280000
@@ -74,20 +76,18 @@ custom_formats:
  score: 11000
 - name: SD Quality Tier 2
  score: 10000
- name: ATVP
-  score: 3000
 - name: Dolby Vision
  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
- name: ATV
-  score: 1000
 - name: DS4K
  score: 1000
 - name: HDR
@@ -136,10 +136,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -166,6 +166,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip (Efficient)
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision (Without Fallback)
  score: -999999
 - name: Full Disc
@@ -207,6 +209,8 @@ custom_formats_radarr:
  score: 303000
 - name: TAoE WEB
  score: 303000
+- name: Weasley WEB
+  score: 303000
 - name: 1080p Compact Movie WEB Tier 2
  score: 302000
 - name: 1080p Compact Movie WEB Tier 3
@@ -219,8 +223,6 @@ custom_formats_radarr:
  score: 3000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
@@ -258,6 +260,8 @@ custom_formats_sonarr:
  score: 309000
 - name: Vialle WEB
  score: 309000
+- name: Weasley WEB
+  score: 309000
 - name: 1080p Compact TV WEB Tier 2
  score: 308000
 - name: 1080p Compact TV WEB Tier 3
--- a/profiles/1080p
+++ b/profiles/1080p
@@ -28,6 +28,8 @@ custom_formats:
 - name: TAoE Bluray
  score: 324000
 - name: 1080p Balanced Tier 1
+  score: 281000
+- name: 1080p Balanced Tier 2
  score: 280000
 - name: 1080p WEB-DL (h264)
  score: 280000
@@ -83,20 +85,18 @@ custom_formats:
  score: 10000
 - name: AMZN
  score: 3000
- name: ATVP
-  score: 3000
 - name: Dolby Vision
  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
- name: ATV
-  score: 1000
 - name: DS4K
  score: 1000
 - name: HDR
@@ -145,10 +145,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -175,6 +175,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip (Efficient)
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision (Without Fallback)
  score: -999999
 - name: Full Disc
@@ -212,6 +214,8 @@ custom_formats_radarr:
  score: 303000
 - name: TAoE WEB
  score: 303000
+- name: Weasley WEB
+  score: 303000
 - name: 1080p Efficient Movie WEB Tier 2
  score: 302000
 - name: 1080p Efficient Movie WEB Tier 3
@@ -222,8 +226,6 @@ custom_formats_radarr:
  score: 4000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
@@ -261,6 +263,8 @@ custom_formats_sonarr:
  score: 307000
 - name: Vialle WEB
  score: 307000
+- name: Weasley WEB
+  score: 307000
 - name: 1080p Efficient TV WEB Tier 2
  score: 306000
 - name: 1080p Efficient TV WEB Tier 3
--- a/profiles/1080p
+++ b/profiles/1080p
@@ -44,6 +44,8 @@ custom_formats:
 - name: 576p Bluray
  score: 120000
 - name: 1080p Balanced Tier 1
+  score: 101000
+- name: 1080p Balanced Tier 2
  score: 100000
 - name: 720p Quality Tier 1
  score: 85000
@@ -89,20 +91,18 @@ custom_formats:
  score: 10000
 - name: AMZN
  score: 3000
- name: ATVP
-  score: 3000
 - name: Dolby Vision
  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
- name: ATV
-  score: 1000
 - name: HDR
  score: 1000
 - name: HDR (Missing)
@@ -151,10 +151,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -185,6 +185,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision (Without Fallback)
  score: -999999
 - name: Full Disc
@@ -206,8 +208,6 @@ custom_formats_radarr:
  score: 4000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
--- a/profiles/1080p
+++ b/profiles/1080p
@@ -41,6 +41,8 @@ custom_formats:
 - name: 576p Bluray
  score: 120000
 - name: 1080p Balanced Tier 1
+  score: 101000
+- name: 1080p Balanced Tier 2
  score: 100000
 - name: 720p Quality Tier 1
  score: 85000
@@ -86,16 +88,14 @@ custom_formats:
  score: 10000
 - name: AMZN
  score: 3000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
- name: ATV
-  score: 1000
 - name: iT
  score: 1000
 - name: NF
@@ -134,10 +134,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -164,6 +164,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision
  score: -999999
 - name: Full Disc
@@ -195,8 +197,6 @@ custom_formats_radarr:
  score: 4000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
--- a/profiles/1080p
+++ b/profiles/1080p
@@ -52,6 +52,8 @@ custom_formats:
 - name: 576p Bluray
  score: 120000
 - name: 1080p Balanced Tier 1
+  score: 101000
+- name: 1080p Balanced Tier 2
  score: 100000
 - name: 720p Quality Tier 1
  score: 85000
@@ -97,12 +99,12 @@ custom_formats:
  score: 10000
 - name: AMZN
  score: 3000
- name: ATVP
-  score: 3000
 - name: Dolby Vision
  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: HMAX
@@ -115,8 +117,6 @@ custom_formats:
  score: 1200
 - name: TrueHD
  score: 1200
- name: ATV
-  score: 1000
 - name: HDR
  score: 1000
 - name: HDR (Missing)
@@ -177,10 +177,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -213,6 +213,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision (Without Fallback)
  score: -999999
 - name: Full Disc
@@ -234,8 +236,6 @@ custom_formats_radarr:
  score: 4000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
--- a/profiles/2160p
+++ b/profiles/2160p
@@ -48,6 +48,8 @@ custom_formats:
 - name: 576p Bluray
  score: 120000
 - name: 1080p Balanced Tier 1
+  score: 101000
+- name: 1080p Balanced Tier 2
  score: 100000
 - name: 720p Quality Tier 1
  score: 85000
@@ -95,6 +97,8 @@ custom_formats:
  score: 3000
 - name: AMZN
  score: 2000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: DTS-X
@@ -105,7 +109,7 @@ custom_formats:
  score: 1200
 - name: TrueHD (Missing)
  score: 1200
- name: ATV
+- name: Amazon Enhancement
  score: 1000
 - name: HDR
  score: 1000
@@ -161,6 +165,8 @@ custom_formats:
  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -214,24 +220,22 @@ custom_formats_radarr:
  score: 442000
 - name: MA
  score: 6000
- name: ATVP
-  score: 4000
 - name: DSNP
  score: 4000
 - name: iT
  score: 4000
- name: Amazon Enhancement
-  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
+- name: Disney+ Enhancement
+  score: -1000
+- name: Movies Anywhere Enhancement
+  score: -2000
 - name: iTunes Enhancement
  score: -3000
 - name: 3D
@@ -251,16 +255,12 @@ custom_formats_radarr:
 custom_formats_sonarr:
 - name: 2160p Balanced Tier 1
  score: 444000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
 - name: HMAX
  score: 3000
 - name: MAX
  score: 3000
- name: Amazon Enhancement
-  score: 1000
 - name: iT
  score: 1000
 - name: Season Pack
--- a/profiles/2160p
+++ b/profiles/2160p
@@ -33,6 +33,8 @@ custom_formats:
 - name: TAoE Bluray
  score: 324000
 - name: 1080p Balanced Tier 1
+  score: 281000
+- name: 1080p Balanced Tier 2
  score: 280000
 - name: 1080p WEB-DL (h264)
  score: 280000
@@ -90,9 +92,11 @@ custom_formats:
  score: 3000
 - name: AMZN
  score: 2000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
- name: ATV
+- name: Amazon Enhancement
  score: 1000
 - name: DS4K
  score: 1000
@@ -144,6 +148,8 @@ custom_formats:
  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -211,6 +217,8 @@ custom_formats_radarr:
  score: 303000
 - name: TAoE WEB
  score: 303000
+- name: Weasley WEB
+  score: 303000
 - name: 1080p Efficient Movie WEB Tier 2
  score: 302000
 - name: 1080p Efficient Movie WEB Tier 3
@@ -219,24 +227,22 @@ custom_formats_radarr:
  score: 300000
 - name: MA
  score: 6000
- name: ATVP
-  score: 4000
 - name: DSNP
  score: 4000
 - name: iT
  score: 4000
- name: Amazon Enhancement
-  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
+- name: Disney+ Enhancement
+  score: -1000
+- name: Movies Anywhere Enhancement
+  score: -2000
 - name: iTunes Enhancement
  score: -3000
 - name: 3D
@@ -288,6 +294,8 @@ custom_formats_sonarr:
  score: 307000
 - name: Vialle WEB
  score: 307000
+- name: Weasley WEB
+  score: 307000
 - name: 1080p Efficient TV WEB Tier 2
  score: 306000
 - name: 1080p Efficient TV WEB Tier 3
@@ -302,16 +310,12 @@ custom_formats_sonarr:
  score: 301000
 - name: 1080p Efficient TV WEB Tier 6
  score: 300000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
 - name: HMAX
  score: 3000
 - name: MAX
  score: 3000
- name: Amazon Enhancement
-  score: 1000
 - name: iT
  score: 1000
 - name: Season Pack
--- a/profiles/2160p
+++ b/profiles/2160p
@@ -66,6 +66,8 @@ custom_formats:
 - name: 576p Bluray
  score: 120000
 - name: 1080p Balanced Tier 1
+  score: 101000
+- name: 1080p Balanced Tier 2
  score: 100000
 - name: 720p Quality Tier 1
  score: 85000
@@ -113,6 +115,8 @@ custom_formats:
  score: 3000
 - name: AMZN
  score: 2000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: DTS-X
@@ -123,7 +127,7 @@ custom_formats:
  score: 1200
 - name: TrueHD (Missing)
  score: 1200
- name: ATV
+- name: Amazon Enhancement
  score: 1000
 - name: HDR
  score: 1000
@@ -181,6 +185,8 @@ custom_formats:
  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -236,24 +242,22 @@ custom_formats_radarr:
  score: 442000
 - name: MA
  score: 6000
- name: ATVP
-  score: 4000
 - name: DSNP
  score: 4000
 - name: iT
  score: 4000
- name: Amazon Enhancement
-  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
+- name: Disney+ Enhancement
+  score: -1000
+- name: Movies Anywhere Enhancement
+  score: -2000
 - name: iTunes Enhancement
  score: -3000
 - name: 3D
@@ -273,16 +277,12 @@ custom_formats_radarr:
 custom_formats_sonarr:
 - name: 2160p Balanced Tier 1
  score: 444000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
 - name: HMAX
  score: 3000
 - name: MAX
  score: 3000
- name: Amazon Enhancement
-  score: 1000
 - name: iT
  score: 1000
 - name: Season Pack
--- a/profiles/2160p
+++ b/profiles/2160p
@@ -70,6 +70,8 @@ custom_formats:
 - name: 576p Bluray
  score: 120000
 - name: 1080p Balanced Tier 1
+  score: 101000
+- name: 1080p Balanced Tier 2
  score: 100000
 - name: 720p Quality Tier 1
  score: 85000
@@ -117,6 +119,8 @@ custom_formats:
  score: 3000
 - name: AMZN
  score: 2000
+- name: ATVP
+  score: 2000
 - name: HDR10+
  score: 2000
 - name: DTS-X
@@ -127,7 +131,7 @@ custom_formats:
  score: 1200
 - name: TrueHD (Missing)
  score: 1200
- name: ATV
+- name: Amazon Enhancement
  score: 1000
 - name: HDR
  score: 1000
@@ -193,6 +197,8 @@ custom_formats:
  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -250,24 +256,22 @@ custom_formats_radarr:
  score: 462000
 - name: MA
  score: 6000
- name: ATVP
-  score: 4000
 - name: DSNP
  score: 4000
 - name: iT
  score: 4000
- name: Amazon Enhancement
-  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
+- name: Disney+ Enhancement
+  score: -1000
+- name: Movies Anywhere Enhancement
+  score: -2000
 - name: iTunes Enhancement
  score: -3000
 - name: 3D
@@ -285,16 +289,12 @@ custom_formats_radarr:
 custom_formats_sonarr:
 - name: 2160p Balanced Tier 1
  score: 464000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
 - name: HMAX
  score: 3000
 - name: MAX
  score: 3000
- name: Amazon Enhancement
-  score: 1000
 - name: iT
  score: 1000
 - name: Season Pack
--- a/profiles/720p
+++ b/profiles/720p
@@ -66,16 +66,14 @@ custom_formats:
  score: 10000
 - name: AMZN
  score: 3000
- name: ATVP
-  score: 3000
 - name: DSNP
  score: 3000
+- name: ATVP
+  score: 2000
 - name: HMAX
  score: 2000
 - name: MAX
  score: 2000
- name: ATV
-  score: 1000
 - name: iT
  score: 1000
 - name: NF
@@ -114,10 +112,10 @@ custom_formats:
  score: 7
 - name: Repack1
  score: 6
- name: BCORE
-  score: 0
 - name: CRAV
  score: 0
+- name: CRIT
+  score: 0
 - name: HTSR
  score: 0
 - name: HULU
@@ -144,6 +142,8 @@ custom_formats:
  score: -999999
 - name: Banned WEBRip
  score: -999999
+- name: BCORE
+  score: -999999
 - name: Dolby Vision
  score: -999999
 - name: Full Disc
@@ -175,8 +175,6 @@ custom_formats_radarr:
  score: 4000
 - name: Better Theatricals
  score: 1000
- name: CRIT
-  score: 1000
 - name: Special Edition
  score: 1000
 - name: 3D
--- a/regex_patterns/5.1
+++ b/regex_patterns/5.1
@@ -0,0 +1,7 @@
+name: 5.1 Surround
+pattern: \D5\.1\D
+description: ''
+tags:
+- Audio
+- Channel
+tests: []
--- a/regex_patterns/Apple
+++ b/regex_patterns/Apple
@@ -1,5 +1,5 @@
 name: Apple TV+
-pattern: \b(atvp|aptv|Apple TV\+)\s*\b
+pattern: \b(ATVP|ATV|APTV|Apple TV\+)\s*\b
 description: Apple TV+ is an American subscription OTT streaming service owned and
  operated by Apple Inc. Launched on November 1, 2019, it offers a selection of original
  production film and television series called Apple Originals.
@@ -7,23 +7,15 @@ tags:
 - Streaming Service
 - WEB-DL
 tests:
- expected: true
-  id: 1
+- id: 1
  input: Palmer.1080p.APTV.WEB-DL.DDP5.1.Atmos.H.264-EVO.mkv
-  lastRun: '2024-12-03T02:31:55.764873'
-  passes: true
- expected: true
-  id: 2
+  expected: true
+- id: 2
  input: Fathom.1080p.APTV.WEB-DL.DDP5.1.Atmos.H.264-CMRG.mkv
-  lastRun: '2024-12-03T02:31:55.764873'
-  passes: true
- expected: false
-  id: 3
+  expected: true
+- id: 3
  input: You.Are.the.Apple.of.My.Eye.2011.720p.BluRay.DD5.1.x264-EbP.mkv
-  lastRun: '2024-12-03T02:31:55.764873'
-  passes: true
- expected: true
-  id: 4
+  expected: false
+- id: 4
  input: Men in Black 1997 2160p Apple TV+ WEB-DL DDP 5 1 Atmos DV H 265-CHDWEB
-  lastRun: '2024-12-03T02:31:55.764873'
-  passes: true
+  expected: true
--- a/regex_patterns/Apple
+++ b/regex_patterns/Apple
@@ -1,10 +0,0 @@
-name: Apple TV
-pattern: \b(ATV)\b
-description: 'Apple TV channels offer a curated selection of content from various
-  streaming services and providers, allowing users to subscribe and access content
-  directly within the Apple TV app. These channels provide a centralized platform
-  for accessing a wide range of movies, TV shows, live sports, and more. '
-tags:
- Streaming Service
- WEB-DL
-tests: []
--- a/regex_patterns/UnKn0wn.yml
+++ b/regex_patterns/UnKn0wn.yml
@@ -0,0 +1,7 @@
+name: UnKn0wn
+pattern: (?<=^|[\s.-])ADE\b
+description: ''
+tags:
+- Release Group
+- Remux
+tests: []
Author	SHA1	Message	Date
Seraphys	f7808afa58	Merge pull request #113 from Dictionarry-Hub/dev - Drop HHWEB to WEB-DL Tier 3 - Move TheFarm to WEB-DL Tier 1 - Ban UnKn0wn - Rank Weasley Webs - Seperate Hallowed and BHDStudio in 1080p	2025-12-10 16:53:11 -06:00
Seraphys	a3d72a8ab6	tweak(format): Drop HHWEB to WEB-DL Tier 3	2025-12-09 12:20:46 -06:00
Seraphys	0e7609608f	tweak(format): Move TheFarm to WEB-DL Tier 1	2025-12-07 17:42:04 -06:00
Seraphys	0833b56229	tweak(profile): Create Disney+ Enhancement and adjust Scores	2025-12-05 18:11:12 -06:00
Seraphys	bc1d50a46d	tweak(profile): Reduce ATVP Score in 2160p Profiles	2025-12-05 18:04:30 -06:00
Seraphys	c296f61156	tweak(profile): Revert Testing Scores & only drop ATVP	2025-12-05 17:55:51 -06:00
Seraphys	1157f44b5f	tweak(format): Combine ATV/ATVP & test New 1080p Streaming Scores	2025-12-05 17:40:52 -06:00
Seraphys	6bc433e5ab	add(regex): Add 5.1 Channel for people who want to rank it	2025-12-03 14:11:49 -06:00
Seraphys	8655ada687	tweak(format): Ban UnKn0wn	2025-12-03 13:54:14 -06:00
Seraphys	a2949d6b17	tweak(format): Rank Weasley Webs	2025-12-03 09:57:57 -06:00
Seraphys	cb2d5cd67e	tweak(format): Seperate Hallowed and BHDStudio in 1080p	2025-11-30 14:43:34 -06:00
Seraphys	79bc01d86f	tweak(format): Add MA Enhancement to 2160p Profiles	2025-11-30 14:32:18 -06:00