diff --git a/custom_formats/1080p Quality Tier 2.yml b/custom_formats/1080p Quality Tier 2.yml index 6197dc8..e529d74 100644 --- a/custom_formats/1080p Quality Tier 2.yml +++ b/custom_formats/1080p Quality Tier 2.yml @@ -31,6 +31,11 @@ conditions: pattern: c0kE required: false type: release_group +- name: coffee + type: release_group + required: false + negate: false + pattern: coffee - name: CtrlHD negate: false pattern: CtrlHD @@ -57,10 +62,10 @@ conditions: required: false type: release_group - name: SoLaR - type: release_group - required: false negate: false pattern: SoLaR + required: false + type: release_group - name: TayTo negate: false pattern: TayTo diff --git a/custom_formats/1080p Quality Tier 5.yml b/custom_formats/1080p Quality Tier 5.yml index c655c26..ab58de9 100644 --- a/custom_formats/1080p Quality Tier 5.yml +++ b/custom_formats/1080p Quality Tier 5.yml @@ -56,11 +56,6 @@ conditions: pattern: CJ required: false type: release_group -- name: coffee - negate: false - pattern: coffee - required: false - type: release_group - name: CRX negate: false pattern: CRX @@ -77,10 +72,10 @@ conditions: required: false type: release_group - name: EA - type: release_group - required: false negate: false pattern: EA + required: false + type: release_group - name: E.N.D negate: false pattern: E.N.D diff --git a/custom_formats/Foreign Release Groups.yml b/custom_formats/Foreign Release Groups.yml deleted file mode 100644 index 5e9f45f..0000000 --- a/custom_formats/Foreign Release Groups.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Foreign Release Groups -description: Matches releases labeled Nordic for now -tags: -- Enhancement -conditions: -- name: Nordic - negate: false - pattern: Nordic - required: true - type: release_title -tests: [] diff --git a/custom_formats/PCM.yml b/custom_formats/PCM.yml index 5a5ff84..dbc6e62 100644 --- a/custom_formats/PCM.yml +++ b/custom_formats/PCM.yml @@ -15,10 +15,10 @@ conditions: required: true type: release_title - name: Not Dolby Digital - type: release_title - required: true negate: true pattern: Dolby Digital + required: true + type: release_title - name: Not Dolby Digital + negate: true pattern: Dolby Digital + @@ -34,11 +34,6 @@ conditions: pattern: FLAC required: true type: release_title -- name: Not PCM - negate: true - pattern: PCM - required: true - type: release_title - name: Not TrueHD negate: true pattern: TrueHD diff --git a/custom_formats/TrueHD (Missing).yml b/custom_formats/TrueHD (Missing).yml index fe5abed..09a11ba 100644 --- a/custom_formats/TrueHD (Missing).yml +++ b/custom_formats/TrueHD (Missing).yml @@ -9,31 +9,31 @@ conditions: required: true resolution: 2160p type: resolution -- name: Remux +- name: Atmos negate: false - pattern: Remux + pattern: Atmos (Missing) required: true type: release_title -- name: TrueHD Missing Groups - negate: false - pattern: TrueHD (Missing Groups) - required: true - type: release_title -- name: Not DTS-HD +- name: Not DD negate: true - pattern: DTS-HD + pattern: Dolby Digital required: true type: release_title -- name: Not DTS-X +- name: Not DD+ negate: true - pattern: DTS-X + pattern: Dolby Digital + + required: true + type: release_title +- name: Not DTS + negate: true + pattern: DTS required: true type: release_title - name: Not FLAC + type: release_title + required: true negate: true pattern: FLAC - required: true - type: release_title - name: Not TrueHD negate: true pattern: TrueHD diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml index 604cfc1..92c33ed 100644 --- a/profiles/1080p Balanced.yml +++ b/profiles/1080p Balanced.yml @@ -1,6 +1,6 @@ name: 1080p Balanced description: '1080p Balanced targets consistent & immutable 1080p **WEB-DLs** using - exernal factors like Streaming Source and Audio Formats + external factors like Streaming Source and Audio Formats - 1080p WEB-DL @@ -71,20 +71,24 @@ custom_formats: score: 1000 - name: NF score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -101,8 +105,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -123,8 +125,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: AV1 score: -999999 - name: Banned Groups diff --git a/profiles/1080p Compact.yml b/profiles/1080p Compact.yml index c0c333d..52e6567 100644 --- a/profiles/1080p Compact.yml +++ b/profiles/1080p Compact.yml @@ -82,20 +82,24 @@ custom_formats: score: 1000 - name: PQ score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -112,8 +116,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -134,8 +136,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: AV1 score: -999999 - name: Banned Groups (Efficient) diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index 591ccb4..0db4f4b 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -91,20 +91,24 @@ custom_formats: score: 1000 - name: PQ score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -121,8 +125,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -143,8 +145,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: AV1 score: -999999 - name: Banned Groups (Efficient) diff --git a/profiles/1080p Quality HDR.yml b/profiles/1080p Quality HDR.yml index 81515de..0e88455 100644 --- a/profiles/1080p Quality HDR.yml +++ b/profiles/1080p Quality HDR.yml @@ -99,20 +99,24 @@ custom_formats: score: 1000 - name: PQ score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -129,8 +133,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -151,8 +153,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: x265 (Bluray) score: -220000 - name: AV1 diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index 9c0bcd9..63f6594 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -80,20 +80,24 @@ custom_formats: score: 1000 - name: NF score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -110,8 +114,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -132,8 +134,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: AV1 score: -999999 - name: Banned Groups diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml index 66a4df0..032b0da 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -91,9 +91,13 @@ custom_formats: score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: DTS-X + score: 1600 +- name: DTS-HD MA + score: 1200 +- name: TrueHD + score: 1200 +- name: ATV score: 1000 - name: HDR score: 1000 @@ -109,30 +113,28 @@ custom_formats: score: 1000 - name: PQ score: 1000 -- name: DTS-HD MA - score: 800 -- name: TrueHD - score: 800 - name: FLAC - score: 700 + score: 800 - name: PCM - score: 700 + score: 800 - name: DTS-HD HRA - score: 500 + score: 700 - name: Opus - score: 500 + score: 700 - name: Dolby Digital + - score: 400 + score: 600 - name: DTS-ES - score: 300 + score: 500 - name: Atmos - score: 200 + score: 400 - name: Atmos (Missing) - score: 200 + score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: Remux Tier 1 score: 100 - name: WEB-DL Tier 1 @@ -157,8 +159,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -179,8 +179,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: x265 (Bluray) score: -220000 - name: AV1 @@ -277,7 +275,7 @@ qualities: name: DVD upgrade_until: id: -1 - name: 1080p Quality + name: 1080p Remux description: All capable of being indistinguishable from source. WEB-DL included to not allow unknown encode to trump known WEB-DL. language: must_original diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index d989591..ee565d3 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -95,20 +95,24 @@ custom_formats: score: 1000 - name: PQ score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -125,8 +129,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -147,8 +149,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: x265 (Bluray) score: -220000 - name: AV1 diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml index 1e4abae..da755f9 100644 --- a/profiles/2160p Efficient.yml +++ b/profiles/2160p Efficient.yml @@ -88,20 +88,24 @@ custom_formats: score: 1000 - name: PQ score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -118,8 +122,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -140,8 +142,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: AV1 score: -999999 - name: Banned Groups (Efficient) diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 7a7799e..74601bd 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -99,9 +99,15 @@ custom_formats: score: 2000 - name: HDR10+ score: 2000 -- name: ATV - score: 1000 - name: DTS-X + score: 1600 +- name: DTS-HD MA + score: 1200 +- name: TrueHD + score: 1200 +- name: TrueHD (Missing) + score: 1200 +- name: ATV score: 1000 - name: HDR score: 1000 @@ -117,30 +123,28 @@ custom_formats: score: 1000 - name: PQ score: 1000 -- name: DTS-HD MA - score: 800 -- name: TrueHD - score: 800 - name: FLAC - score: 700 + score: 800 - name: PCM - score: 700 + score: 800 - name: DTS-HD HRA - score: 500 + score: 700 - name: Opus - score: 500 + score: 700 - name: Dolby Digital + - score: 400 + score: 600 - name: DTS-ES - score: 300 + score: 500 - name: Atmos - score: 200 + score: 400 - name: Atmos (Missing) - score: 200 + score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -157,8 +161,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -179,8 +181,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: x265 (Bluray) score: -220000 - name: AV1 diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index 2ec78b1..cd407b0 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -103,9 +103,15 @@ custom_formats: score: 2000 - name: HDR10+ score: 2000 -- name: ATV - score: 1000 - name: DTS-X + score: 1600 +- name: DTS-HD MA + score: 1200 +- name: TrueHD + score: 1200 +- name: TrueHD (Missing) + score: 1200 +- name: ATV score: 1000 - name: HDR score: 1000 @@ -121,32 +127,28 @@ custom_formats: score: 1000 - name: PQ score: 1000 -- name: DTS-HD MA - score: 800 -- name: TrueHD - score: 800 -- name: TrueHD (Missing) - score: 800 - name: FLAC - score: 700 + score: 800 - name: PCM - score: 700 + score: 800 - name: DTS-HD HRA - score: 500 + score: 700 - name: Opus - score: 500 + score: 700 - name: Dolby Digital + - score: 400 + score: 600 - name: DTS-ES - score: 300 + score: 500 - name: Atmos - score: 200 + score: 400 - name: Atmos (Missing) - score: 200 + score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: Remux Tier 1 score: 100 - name: WEB-DL Tier 1 @@ -171,8 +173,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -193,8 +193,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: x265 (Bluray) score: -220000 - name: AV1 diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index e9a1f9a..7713f8a 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -60,20 +60,24 @@ custom_formats: score: 1000 - name: NF score: 1000 +- name: FLAC + score: 800 - name: DTS-HD HRA - score: 800 + score: 700 - name: Opus - score: 800 + score: 700 - name: Dolby Digital + score: 600 +- name: DTS-ES + score: 500 - name: Dolby Atmos score: 400 -- name: DTS-ES - score: 400 - name: Dolby Digital - score: 200 + score: 400 - name: DTS - score: 100 + score: 300 +- name: AAC + score: 200 - name: WEB-DL Tier 1 score: 100 - name: WEB-DL Tier 2 @@ -90,8 +94,6 @@ custom_formats: score: 7 - name: Repack1 score: 6 -- name: AAC - score: 0 - name: BCORE score: 0 - name: CRAV @@ -112,8 +114,6 @@ custom_formats: score: 0 - name: STAN score: 0 -- name: Foreign Release Groups - score: -900 - name: AV1 score: -999999 - name: Banned Groups diff --git a/regex_patterns/Atmos (Missing).yml b/regex_patterns/Atmos (Missing).yml new file mode 100644 index 0000000..9c7b97f --- /dev/null +++ b/regex_patterns/Atmos (Missing).yml @@ -0,0 +1,19 @@ +name: Atmos (Missing) +pattern: \bATMOS(\b|\d) +description: '' +tags: +- Audio +- Enhancement +tests: +- id: 1 + input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP + expected: false +- id: 2 + input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR + expected: true +- id: 3 + input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX + expected: true +- id: 4 + input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX + expected: false diff --git a/regex_patterns/Nordic.yml b/regex_patterns/Nordic.yml deleted file mode 100644 index 26c8a36..0000000 --- a/regex_patterns/Nordic.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Nordic -pattern: \b(Nordic)\b -description: Matches releases with the word Nordic -tags: -- Aspect Ratio -- Enhancement -tests: []