From 1157f44b5f328ad81bfc4f26711b1d5ab08fc51d Mon Sep 17 00:00:00 2001 From: Seraphys Date: Fri, 5 Dec 2025 17:40:52 -0600 Subject: [PATCH] tweak(format): Combine ATV/ATVP & test New 1080p Streaming Scores --- custom_formats/ATV.yml | 40 ---------------------------------- profiles/1080p Balanced.yml | 36 +++++++++++++++--------------- profiles/1080p Compact.yml | 36 +++++++++++++++--------------- profiles/1080p Efficient.yml | 36 +++++++++++++++--------------- profiles/1080p Quality HDR.yml | 36 +++++++++++++++--------------- profiles/1080p Quality.yml | 36 +++++++++++++++--------------- profiles/1080p Remux.yml | 36 +++++++++++++++--------------- profiles/2160p Balanced.yml | 2 -- profiles/2160p Efficient.yml | 2 -- profiles/2160p Quality.yml | 2 -- profiles/2160p Remux.yml | 2 -- profiles/720p Quality.yml | 36 +++++++++++++++--------------- regex_patterns/Apple TV+.yml | 26 ++++++++-------------- regex_patterns/Apple TV.yml | 10 --------- 14 files changed, 128 insertions(+), 208 deletions(-) delete mode 100644 custom_formats/ATV.yml delete mode 100644 regex_patterns/Apple TV.yml diff --git a/custom_formats/ATV.yml b/custom_formats/ATV.yml deleted file mode 100644 index 17cc882..0000000 --- a/custom_formats/ATV.yml +++ /dev/null @@ -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 diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml index 6ba13b9..7a31268 100644 --- a/profiles/1080p Balanced.yml +++ b/profiles/1080p Balanced.yml @@ -78,20 +78,24 @@ custom_formats: - name: SD Quality Tier 2 score: 10000 - name: AMZN - score: 3000 + score: 4000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 -- name: DSNP - score: 3000 - name: HMAX - score: 2000 + score: 3000 - name: MAX - score: 2000 -- name: ATV - score: 1000 + score: 3000 - name: iT - score: 1000 + score: 2000 - name: NF + score: 2000 +- name: PCOK + score: 1000 +- name: PMTP + score: 1000 +- name: STAN score: 1000 - name: FLAC score: 800 @@ -127,10 +131,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 @@ -139,16 +143,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: AV1 score: -999999 - name: Banned Groups @@ -157,6 +155,8 @@ custom_formats: score: -999999 - name: Banned WEBRip score: -999999 +- name: BCORE + score: -999999 - name: Dolby Vision score: -999999 - name: Full Disc @@ -185,11 +185,9 @@ custom_formats: score: -999999 custom_formats_radarr: - name: MA - score: 4000 + score: 5000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/profiles/1080p Compact.yml b/profiles/1080p Compact.yml index 1aa9d2f..0a4b6f0 100644 --- a/profiles/1080p Compact.yml +++ b/profiles/1080p Compact.yml @@ -76,20 +76,22 @@ custom_formats: score: 11000 - name: SD Quality Tier 2 score: 10000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 - name: Dolby Vision score: 3000 -- name: DSNP +- name: HMAX + score: 3000 +- name: MAX score: 3000 - name: HDR10+ score: 2000 -- name: HMAX +- name: iT score: 2000 -- name: MAX +- name: NF score: 2000 -- name: ATV - score: 1000 - name: DS4K score: 1000 - name: HDR @@ -98,12 +100,14 @@ custom_formats: score: 1000 - name: HLG score: 1000 -- name: iT +- name: PCOK score: 1000 -- name: NF +- name: PMTP score: 1000 - name: PQ score: 1000 +- name: STAN + score: 1000 - name: FLAC score: 800 - name: DTS-HD HRA @@ -138,10 +142,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 @@ -150,16 +154,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: AV1 score: -999999 - name: Banned Groups (Efficient) @@ -168,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 @@ -218,13 +218,11 @@ custom_formats_radarr: - name: 1080p Compact Movie WEB Tier 4 score: 300000 - name: MA - score: 4000 + score: 5000 - name: AMZN - score: 3000 + score: 4000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index 1c57ca2..27c3d1b 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -84,21 +84,23 @@ custom_formats: - name: SD Quality Tier 2 score: 10000 - name: AMZN - score: 3000 + score: 4000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 - name: Dolby Vision score: 3000 -- name: DSNP +- name: HMAX + score: 3000 +- name: MAX score: 3000 - name: HDR10+ score: 2000 -- name: HMAX +- name: iT score: 2000 -- name: MAX +- name: NF score: 2000 -- name: ATV - score: 1000 - name: DS4K score: 1000 - name: HDR @@ -107,12 +109,14 @@ custom_formats: score: 1000 - name: HLG score: 1000 -- name: iT +- name: PCOK score: 1000 -- name: NF +- name: PMTP score: 1000 - name: PQ score: 1000 +- name: STAN + score: 1000 - name: FLAC score: 800 - name: DTS-HD HRA @@ -147,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 @@ -159,16 +163,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: AV1 score: -999999 - name: Banned Groups (Efficient) @@ -177,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 @@ -223,11 +223,9 @@ custom_formats_radarr: - name: 1080p Efficient Movie WEB Tier 4 score: 300000 - name: MA - score: 4000 + score: 5000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/profiles/1080p Quality HDR.yml b/profiles/1080p Quality HDR.yml index bfacd5a..446e6b8 100644 --- a/profiles/1080p Quality HDR.yml +++ b/profiles/1080p Quality HDR.yml @@ -90,21 +90,23 @@ custom_formats: - name: SD Quality Tier 2 score: 10000 - name: AMZN - score: 3000 + score: 4000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 - name: Dolby Vision score: 3000 -- name: DSNP +- name: HMAX + score: 3000 +- name: MAX score: 3000 - name: HDR10+ score: 2000 -- name: HMAX +- name: iT score: 2000 -- name: MAX +- name: NF score: 2000 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) @@ -113,12 +115,14 @@ custom_formats: score: 1000 - name: HLG score: 1000 -- name: iT +- name: PCOK score: 1000 -- name: NF +- name: PMTP score: 1000 - name: PQ score: 1000 +- name: STAN + score: 1000 - name: FLAC score: 800 - name: DTS-HD HRA @@ -153,10 +157,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 @@ -165,16 +169,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: x265 (Bluray) score: -400000 - name: AV1 @@ -187,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 @@ -205,11 +205,9 @@ custom_formats: score: -999999 custom_formats_radarr: - name: MA - score: 4000 + score: 5000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index a1c8e5c..3d05641 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -87,20 +87,24 @@ custom_formats: - name: SD Quality Tier 2 score: 10000 - name: AMZN - score: 3000 + score: 4000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 -- name: DSNP - score: 3000 - name: HMAX - score: 2000 + score: 3000 - name: MAX - score: 2000 -- name: ATV - score: 1000 + score: 3000 - name: iT - score: 1000 + score: 2000 - name: NF + score: 2000 +- name: PCOK + score: 1000 +- name: PMTP + score: 1000 +- name: STAN score: 1000 - name: FLAC score: 800 @@ -136,10 +140,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 @@ -148,16 +152,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: AV1 score: -999999 - name: Banned Groups @@ -166,6 +164,8 @@ custom_formats: score: -999999 - name: Banned WEBRip score: -999999 +- name: BCORE + score: -999999 - name: Dolby Vision score: -999999 - name: Full Disc @@ -194,11 +194,9 @@ custom_formats: score: -999999 custom_formats_radarr: - name: MA - score: 4000 + score: 5000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml index cc67191..4154a6c 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -98,18 +98,22 @@ custom_formats: - name: SD Quality Tier 2 score: 10000 - name: AMZN - score: 3000 + score: 4000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 - name: Dolby Vision score: 3000 -- name: DSNP +- name: HMAX + score: 3000 +- name: MAX score: 3000 - name: HDR10+ score: 2000 -- name: HMAX +- name: iT score: 2000 -- name: MAX +- name: NF score: 2000 - name: DTS-X score: 1600 @@ -117,8 +121,6 @@ custom_formats: score: 1200 - name: TrueHD score: 1200 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) @@ -127,12 +129,14 @@ custom_formats: score: 1000 - name: HLG score: 1000 -- name: iT +- name: PCOK score: 1000 -- name: NF +- name: PMTP score: 1000 - name: PQ score: 1000 +- name: STAN + score: 1000 - name: FLAC score: 800 - name: PCM @@ -179,10 +183,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 @@ -191,16 +195,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: x265 (Bluray) score: -400000 - name: AV1 @@ -215,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 @@ -233,11 +233,9 @@ custom_formats: score: -999999 custom_formats_radarr: - name: MA - score: 4000 + score: 5000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index 88c1bc6..cdd2630 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -107,8 +107,6 @@ custom_formats: score: 1200 - name: TrueHD (Missing) score: 1200 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml index a50f0fd..a49073b 100644 --- a/profiles/2160p Efficient.yml +++ b/profiles/2160p Efficient.yml @@ -94,8 +94,6 @@ custom_formats: score: 2000 - name: HDR10+ score: 2000 -- name: ATV - score: 1000 - name: DS4K score: 1000 - name: HDR diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 7fbc2a5..ff8e7c0 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -125,8 +125,6 @@ custom_formats: score: 1200 - name: TrueHD (Missing) score: 1200 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index 3a3af46..786f321 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -129,8 +129,6 @@ custom_formats: score: 1200 - name: TrueHD (Missing) score: 1200 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index 3ae52a5..3c142e7 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -65,20 +65,24 @@ custom_formats: - name: SD Quality Tier 2 score: 10000 - name: AMZN - score: 3000 + score: 4000 +- name: DSNP + score: 4000 - name: ATVP score: 3000 -- name: DSNP - score: 3000 - name: HMAX - score: 2000 + score: 3000 - name: MAX - score: 2000 -- name: ATV - score: 1000 + score: 3000 - name: iT - score: 1000 + score: 2000 - name: NF + score: 2000 +- name: PCOK + score: 1000 +- name: PMTP + score: 1000 +- name: STAN score: 1000 - name: FLAC score: 800 @@ -114,10 +118,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 @@ -126,16 +130,10 @@ custom_formats: score: 0 - name: NOW score: 0 -- name: PCOK - score: 0 -- name: PMTP - score: 0 - name: ROKU score: 0 - name: SHO score: 0 -- name: STAN - score: 0 - name: AV1 score: -999999 - name: Banned Groups @@ -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 @@ -172,11 +172,9 @@ custom_formats: score: -999999 custom_formats_radarr: - name: MA - score: 4000 + score: 5000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/regex_patterns/Apple TV+.yml b/regex_patterns/Apple TV+.yml index e1ed3c8..bdad9de 100644 --- a/regex_patterns/Apple TV+.yml +++ b/regex_patterns/Apple TV+.yml @@ -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 diff --git a/regex_patterns/Apple TV.yml b/regex_patterns/Apple TV.yml deleted file mode 100644 index 23aff63..0000000 --- a/regex_patterns/Apple TV.yml +++ /dev/null @@ -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: []