refactor(format): Change Condition Order (#24)

- Move condition orders around for organisation
- No logic changes

custom_formats/1080p Balanced Tier 1.yml

@@ -5,16 +5,16 @@ tags:
 - Balanced
 - 1080p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 1080p
   negate: false
   required: true
   resolution: 1080p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: BHDStudio
   negate: false
   pattern: BHDStudio

custom_formats/1080p Balanced Tier 2.yml

@@ -5,16 +5,16 @@ tags:
 - Balanced
 - 1080p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 1080p
   negate: false
   required: true
   resolution: 1080p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: hallowed
   negate: false
   pattern: hallowed

custom_formats/1080p Quality Tier 1.yml

@@ -6,6 +6,16 @@ tags:
 - 1080p
 - Quality
 conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Not WEB-DL
+  type: source
+  required: true
+  negate: true
+  source: web_dl
 - name: DON
   negate: false
   pattern: DON
@@ -21,14 +31,4 @@ conditions:
   pattern: EbP
   required: false
   type: release_group
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
-  negate: true
-  source: web_dl
 tests: []

custom_formats/1080p Quality Tier 2.yml

@@ -6,6 +6,16 @@ tags:
 - 1080p
 - Quality
 conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Not WEB-DL
+  type: source
+  required: true
+  negate: true
+  source: web_dl
 - name: c0ke
   negate: false
   pattern: c0ke
@@ -41,14 +51,4 @@ conditions:
   pattern: ZQ
   required: false
   type: release_group
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
-  negate: true
-  source: web_dl
 tests: []

custom_formats/1080p Quality Tier 3.yml

@@ -6,6 +6,16 @@ tags:
 - 1080p
 - Quality
 conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Not WEB-DL
+  type: source
+  required: true
+  negate: true
+  source: web_dl
 - name: CRiSC
   negate: false
   pattern: CRiSC
@@ -46,14 +56,4 @@ conditions:
   pattern: WMING
   required: false
   type: release_group
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
-  negate: true
-  source: web_dl
 tests: []

custom_formats/1080p Quality Tier 4.yml

@@ -6,6 +6,16 @@ tags:
 - 1080p
 - Quality
 conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: BMF
   negate: false
   pattern: BMF
@@ -41,14 +51,4 @@ conditions:
   pattern: NTb
   required: false
   type: release_group
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 tests: []

custom_formats/1080p Quality Tier 5.yml

@@ -6,6 +6,21 @@ tags:
 - 1080p
 - Quality
 conditions:
+- name: 1080p
+  type: resolution
+  required: true
+  negate: false
+  resolution: 1080p
+- name: Not WEB-DL
+  type: source
+  required: true
+  negate: true
+  source: web_dl
+- name: Not DVD
+  type: source
+  required: true
+  negate: true
+  source: dvd
 - name: AJP69
   negate: false
   pattern: AJP69
@@ -236,19 +251,4 @@ conditions:
   required: false
   negate: false
   pattern: ZoroSenpai
-- name: Not WEB-DL
-  type: source
-  required: true
-  negate: true
-  source: web_dl
-- name: Not DVD
-  type: source
-  required: true
-  negate: true
-  source: dvd
-- name: 1080p
-  type: resolution
-  required: true
-  negate: false
-  resolution: 1080p
 tests: []

custom_formats/2160p Balanced Tier 1.yml

@@ -5,16 +5,16 @@ tags:
 - Balanced
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: HONE
   negate: false
   pattern: HONE

custom_formats/2160p Balanced Tier 2.yml

@@ -5,16 +5,16 @@ tags:
 - Balanced
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: hallowed
   negate: false
   pattern: hallowed

custom_formats/2160p Quality Tier 1.yml

@@ -5,16 +5,16 @@ tags:
 - Quality
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: DON
   negate: false
   pattern: DON

custom_formats/2160p Quality Tier 2.yml

@@ -5,16 +5,16 @@ tags:
 - Quality
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: BSTD
   negate: false
   pattern: BSTD

custom_formats/2160p Quality Tier 3.yml

@@ -5,16 +5,16 @@ tags:
 - Quality
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: JustWatch
   negate: false
   pattern: JustWatch

custom_formats/2160p Quality Tier 4.yml

@@ -5,16 +5,16 @@ tags:
 - Quality
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: 4KDVS
   negate: false
   pattern: 4KDVS

custom_formats/2160p Quality Tier 5.yml

@@ -5,16 +5,16 @@ tags:
 - Quality
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: SoLaR
   negate: false
   pattern: SoLaR

custom_formats/2160p Quality Tier 6.yml

@@ -5,16 +5,16 @@ tags:
 - Quality
 - 2160p
 conditions:
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
-  type: source
 - name: 2160p
   negate: false
   required: true
   resolution: 2160p
   type: resolution
+- name: Not WEB-DL
+  negate: true
+  required: true
+  source: web_dl
+  type: source
 - name: micius
   negate: false
   pattern: micius

custom_formats/Atmos (Missing).yml

@@ -6,11 +6,6 @@ tags:
 - Enhancement
 - Dolby
 conditions:
-- name: Not Atmos
-  negate: true
-  pattern: Atmos
-  required: true
-  type: release_title
 - name: 7.1 Surround
   negate: false
   pattern: 7.1 Surround
@@ -21,6 +16,11 @@ conditions:
   pattern: TrueHD
   required: true
   type: release_title
+- name: Not Atmos
+  negate: true
+  pattern: Atmos
+  required: true
+  type: release_title
 - name: Not Atmos (BTN)
   negate: true
   pattern: BTN Atmos

custom_formats/Blu-ray Encode.yml

@@ -3,14 +3,14 @@ description: Matches Blu-rays that are NOT remuxes
 tags:
 - Source
 conditions:
-- name: Remux
-  type: release_title
-  required: true
-  negate: true
-  pattern: Remux
 - name: Blu-ray
   type: source
   required: true
   negate: false
   source: bluray
+- name: Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 tests: []

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

@@ -4,6 +4,21 @@ tags:
 - Colour Grade
 - HDR
 conditions:
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 1080p
+  type: resolution
+- name: Dolby Vision
+  negate: false
+  pattern: Dolby Vision
+  required: true
+  type: release_title
+- name: x265
+  negate: false
+  pattern: x265
+  required: true
+  type: release_title
 - name: Not SDR
   negate: true
   pattern: SDR
@@ -19,19 +34,4 @@ conditions:
   pattern: HDR10
   required: true
   type: release_title
-- name: Dolby Vision
-  negate: false
-  pattern: Dolby Vision
-  required: true
-  type: release_title
-- name: x265
-  negate: false
-  pattern: x265
-  required: true
-  type: release_title
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 1080p
-  type: resolution
 tests: []

custom_formats/HDR10 (Missing).yml

@@ -4,6 +4,11 @@ tags:
 - Colour Grade
 - HDR
 conditions:
+- name: 2160p
+  negate: false
+  required: true
+  resolution: 2160p
+  type: resolution
 - name: Blu-ray
   type: source
   required: true
@@ -19,11 +24,6 @@ conditions:
   pattern: HDR10+
   required: true
   type: release_title
-- name: 2160p
-  negate: false
-  required: true
-  resolution: 2160p
-  type: resolution
 - name: Not SDR
   negate: true
   pattern: SDR

custom_formats/SD Quality Tier 1.yml

@@ -6,6 +6,11 @@ tags:
 - Quality
 - SD
 conditions:
+- name: DVD
+  negate: false
+  required: true
+  source: dvd
+  type: source
 - name: TBB
   negate: false
   pattern: c0ke
@@ -16,9 +21,4 @@ conditions:
   pattern: Dariush
   required: false
   type: release_group
-- name: DVD
-  negate: false
-  required: true
-  source: dvd
-  type: source
 tests: []

custom_formats/SD Quality Tier 2.yml

@@ -6,14 +6,14 @@ tags:
 - Quality
 - SD
 conditions:
-- name: HANDJOB
-  negate: false
-  pattern: HANDJOB
-  required: false
-  type: release_group
 - name: DVD
   negate: false
   required: true
   source: dvd
   type: source
+- name: HANDJOB
+  negate: false
+  pattern: HANDJOB
+  required: false
+  type: release_group
 tests: []

custom_formats/SDR.yml

@@ -4,16 +4,16 @@ tags:
 - Colour Grade
 - HDR
 conditions:
-- name: WEB-DL
-  type: source
-  required: true
-  negate: false
-  source: web_dl
 - name: 2160p
   type: resolution
   required: true
   negate: false
   resolution: 2160p
+- name: WEB-DL
+  type: source
+  required: true
+  negate: false
+  source: web_dl
 - name: Not HDR10+
   type: release_title
   required: true

custom_formats/TrueHD (Missing).yml

@@ -4,11 +4,6 @@ description: Attempts to match TrueHD releases which are not labelled correctly
 tags:
 - Audio
 conditions:
-- name: TrueHD Missing Groups
-  negate: false
-  pattern: TrueHD (Missing Groups)
-  required: true
-  type: release_title
 - name: 2160p
   negate: false
   required: true
@@ -19,6 +14,11 @@ conditions:
   pattern: Remux
   required: true
   type: release_title
+- name: TrueHD Missing Groups
+  negate: false
+  pattern: TrueHD (Missing Groups)
+  required: true
+  type: release_title
 - name: Not DTS-HD
   negate: true
   pattern: DTS-HD

custom_formats/UHD Bluray (Missing).yml

@@ -6,26 +6,26 @@ tags:
 - Storage
 - 2160p
 conditions:
-- name: Release Groups
-  type: release_group
-  required: true
-  negate: false
-  pattern: UHD Bluray (Missing Groups)
 - name: 1080p
   negate: false
   required: true
   resolution: 1080p
   type: resolution
-- name: Not UHD Blu-ray
-  negate: true
-  pattern: UHD Blu-ray
-  required: true
-  type: release_title
 - name: HDR
   negate: false
   pattern: Basic HDR Formats
   required: true
   type: release_title
+- name: Release Groups
+  type: release_group
+  required: true
+  negate: false
+  pattern: UHD Bluray (Missing Groups)
+- name: Not UHD Blu-ray
+  negate: true
+  pattern: UHD Blu-ray
+  required: true
+  type: release_title
 tests:
 - conditionResults:
   - matches: true

custom_formats/Unknown Lossless Audio.yml

@@ -5,16 +5,16 @@ description: 'Matches UHD Blu-rays (remux / encode) that don''t include a named
 tags:
 - Audio
 conditions:
-- name: Blu-ray
-  type: source
-  required: true
-  negate: false
-  source: bluray
 - name: 2160p
   type: resolution
   required: true
   negate: false
   resolution: 2160p
+- name: Blu-ray
+  type: source
+  required: true
+  negate: false
+  source: bluray
 - name: Not DTS-HD MA
   type: release_title
   required: true

custom_formats/h265.yml

@@ -3,6 +3,11 @@ description: Matches 'h265' regex pattern.
 tags:
 - Codec
 conditions:
+- name: WEB
+  type: source
+  required: true
+  negate: false
+  source: web_dl
 - name: h265
   negate: false
   pattern: h265
@@ -18,11 +23,6 @@ conditions:
   required: true
   negate: true
   pattern: Remux
-- name: WEB
-  type: source
-  required: true
-  negate: false
-  source: web_dl
 - name: Not 4K
   type: resolution
   required: true

custom_formats/iTunes (Missing).yml

@@ -7,16 +7,16 @@ tags:
 - WEB-DL
 - WEB3 [1080p]
 conditions:
-- name: WEBRip
-  negate: true
-  required: true
-  source: webrip
-  type: source
 - name: WEB-DL
   negate: false
   required: true
   source: web_dl
   type: source
+- name: WEBRip
+  negate: true
+  required: true
+  source: webrip
+  type: source
 - name: MA Regex
   negate: true
   pattern: Movies Anywhere

custom_formats/x264 (2160p).yml

@@ -4,14 +4,14 @@ tags:
 - Codec
 - Resolution
 conditions:
-- name: 1080p
-  negate: false
-  required: true
-  resolution: 2160p
-  type: resolution
 - name: x264
   negate: false
   pattern: x264
   required: true
   type: release_title
+- name: 1080p
+  negate: false
+  required: true
+  resolution: 2160p
+  type: resolution
 tests: []

custom_formats/x265 (Missing).yml

@@ -14,16 +14,16 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: Not x265
-  negate: true
-  pattern: x265
-  required: true
-  type: release_title
 - name: h265
   negate: false
   pattern: h265
   required: true
   type: release_title
+- name: Not x265
+  negate: true
+  pattern: x265
+  required: true
+  type: release_title
 tests:
 - conditionResults:
   - matches: false