From 9203b07b372ce82cc2c8cb15deba43ffcd6e008d Mon Sep 17 00:00:00 2001 From: santiagosayshey Date: Sat, 18 Jan 2025 10:51:52 +1050 Subject: [PATCH] tweak(profile): Various improvements / tweaks - Remove required groups for HDR missing CF - New CF for unknown lossless audio - New 2160p Balanced tiers - Normalise lossless audio / quality tier scores --- custom_formats/2160p Balanced Tier 1.yml | 95 ++++++++++++++++++++ custom_formats/2160p Balanced Tier 2.yml | 100 ++++++++++++++++++++++ custom_formats/HDR10 (Missing).yml | 10 +-- custom_formats/Unknown Lossless Audio.yml | 63 ++++++++++++++ profiles/2160p Quality.yml | 28 ++++-- regex_patterns/HDR10 (Missing Groups).yml | 2 +- 6 files changed, 283 insertions(+), 15 deletions(-) create mode 100644 custom_formats/2160p Balanced Tier 1.yml create mode 100644 custom_formats/2160p Balanced Tier 2.yml create mode 100644 custom_formats/Unknown Lossless Audio.yml diff --git a/custom_formats/2160p Balanced Tier 1.yml b/custom_formats/2160p Balanced Tier 1.yml new file mode 100644 index 0000000..b7eb64a --- /dev/null +++ b/custom_formats/2160p Balanced Tier 1.yml @@ -0,0 +1,95 @@ +name: 2160p Balanced Tier 1 +description: Matches release groups who fall under 2160p Balanced Tier 1 +tags: +- Release Group +- Tier +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: HONE + type: release_title + required: false + negate: false + pattern: HONE +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 diff --git a/custom_formats/2160p Balanced Tier 2.yml b/custom_formats/2160p Balanced Tier 2.yml new file mode 100644 index 0000000..234deec --- /dev/null +++ b/custom_formats/2160p Balanced Tier 2.yml @@ -0,0 +1,100 @@ +name: 2160p Balanced Tier 2 +description: Matches release groups who fall under 2160p Balanced Tier 2 +tags: +- Release Group +- Tier +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: hallowed + type: release_group + required: false + negate: false + pattern: hallowed +- 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 diff --git a/custom_formats/HDR10 (Missing).yml b/custom_formats/HDR10 (Missing).yml index f4b81fc..a1dcea3 100644 --- a/custom_formats/HDR10 (Missing).yml +++ b/custom_formats/HDR10 (Missing).yml @@ -4,6 +4,11 @@ tags: - Colour Grade - HDR conditions: +- name: Blu-ray + type: source + required: true + negate: false + source: bluray - name: Not HDR10 negate: true pattern: HDR10 @@ -19,11 +24,6 @@ conditions: required: true resolution: 2160p type: resolution -- name: Missing Groups - negate: false - pattern: HDR10 (Missing Groups) - required: true - type: release_title - name: Not SDR negate: true pattern: SDR diff --git a/custom_formats/Unknown Lossless Audio.yml b/custom_formats/Unknown Lossless Audio.yml new file mode 100644 index 0000000..3bd7339 --- /dev/null +++ b/custom_formats/Unknown Lossless Audio.yml @@ -0,0 +1,63 @@ +name: Unknown Lossless Audio +description: 'Matches UHD Blu-rays (remux / encode) that don''t include a named audio + track. Since all UHD Blu-rays include lossless audio, it''s safe to assume that + some lossless audio track does exist, and just isn''t labelled. ' +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: Not DTS-HD MA + type: release_title + required: true + negate: true + pattern: DTS-HD MA +- name: Not DTS-X + type: release_title + required: true + negate: true + pattern: DTS-X +- name: Not FLAC + negate: true + pattern: FLAC + required: true + type: release_title +- name: Not PCM + negate: true + pattern: PCM + required: true + type: release_title +- name: Not AAC + negate: true + pattern: AAC + required: true + type: release_title +- name: Not DTS + negate: true + pattern: DTS + required: true + type: release_title +- name: Not TrueHD + Atmos + negate: true + pattern: TrueHD + Atmos + required: true + type: release_title +- name: Not Dolby Digital + negate: true + pattern: Dolby Digital + required: true + type: release_title +- name: Not Dolby Digital + + negate: true + pattern: Dolby Digital + + required: true + type: release_title +tests: [] diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 57db028..85a476e 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -17,16 +17,20 @@ minCustomFormatScore: 0 upgradeUntilScore: 800 minScoreIncrement: 10 custom_formats: +- name: 2160p Quality Tier 1 + score: 320 +- name: 2160p Quality Tier 2 + score: 310 - name: 2160p score: 300 -- name: 2160p Quality Tier 1 - score: 300 -- name: 2160p Quality Tier 2 - score: 290 - name: 2160p Quality Tier 3 - score: 280 + score: 300 - name: 2160p Quality Tier 4 - score: 200 + score: 290 +- name: 2160p Balanced Tier 1 + score: 250 +- name: 2160p Balanced Tier 2 + score: 240 - name: 2160p Quality Tier 5 score: 190 - name: 2160p Quality Tier 6 @@ -81,6 +85,8 @@ custom_formats: score: 30 - name: SD Quality Tier 1 score: 30 +- name: 1080p Balanced Tier 1 + score: 20 - name: 1080p Quality Tier 5 score: 20 - name: HBO Max [1080p] @@ -94,6 +100,8 @@ custom_formats: - name: SD Quality Tier 2 score: 20 - name: DTS-X + score: 15 +- name: 1080p Balanced Tier 2 score: 10 - name: HDR10 score: 10 @@ -109,6 +117,10 @@ custom_formats: score: 10 - name: Roku [1080p] score: 10 +- name: TrueHD + score: 10 +- name: TrueHD (Missing) + score: 10 - name: x264 score: 10 - name: Atmos @@ -119,9 +131,7 @@ custom_formats: score: 5 - name: FLAC score: 5 -- name: TrueHD - score: 5 -- name: TrueHD (Missing) +- name: Unknown Lossless Audio score: 5 - name: SDR score: -80 diff --git a/regex_patterns/HDR10 (Missing Groups).yml b/regex_patterns/HDR10 (Missing Groups).yml index c2ff830..5e5b381 100644 --- a/regex_patterns/HDR10 (Missing Groups).yml +++ b/regex_patterns/HDR10 (Missing Groups).yml @@ -1,5 +1,5 @@ name: HDR10 (Missing Groups) -pattern: \b(FraMeSToR|HQMUX|SiCFoI|playBD|RYU|ElNeekster|CiNEPHiLES|3L|EDV|Kenobi|TRiToN|HDH|NTb|Flights|TekMUX|HDS|Aisha(@RFX)?|STRiKES)\b +pattern: \b(FraMeSToR|HQMUX|SiCFoI|playBD|RYU|ElNeekster|CiNEPHiLES|3L|EDV|Kenobi|TRiToN|HDH|NTb|Flights|TekMUX|HDS|Aisha(@RFX)?|STRiKES|c0kE|mimic)\b description: Matches groups who mislabel HDR10 tags: - Release Group