From 27458f41f851c0301b21075a74c1af4eddc3e2bf Mon Sep 17 00:00:00 2001 From: Seraphys Date: Wed, 15 Oct 2025 11:40:54 -0500 Subject: [PATCH 01/10] tweak(format): Remove 1080p Golden Popcorn Flag for all Profiles --- profiles/1080p Quality (HDR).yml | 2 -- profiles/1080p Quality.yml | 2 -- profiles/1080p Remux.yml | 2 -- profiles/2160p Balanced.yml | 2 -- profiles/2160p Quality.yml | 2 -- profiles/2160p Remux.yml | 2 -- 6 files changed, 12 deletions(-) diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml index 3b2dc941..a41772f2 100644 --- a/profiles/1080p Quality (HDR).yml +++ b/profiles/1080p Quality (HDR).yml @@ -182,8 +182,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 8000 - name: 720p Golden Popcorn score: 6000 - name: MA diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index 313282f3..555d01be 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -169,8 +169,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 8000 - name: 720p Golden Popcorn score: 6000 - name: MA diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml index 8cd27899..4f8e3217 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -212,8 +212,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 8000 - name: 720p Golden Popcorn score: 6000 - name: MA diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index 1c3aab9a..b7597716 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -180,8 +180,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 8000 - name: 720p Golden Popcorn score: 6000 - name: MA diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 4cc00387..2d1e1c5b 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -214,8 +214,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 8000 - name: 720p Golden Popcorn score: 6000 - name: MA diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index a8c39241..08bf5f37 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -230,8 +230,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 8000 - name: 720p Golden Popcorn score: 6000 - name: MA From 9d81e70f9d90031e1a69efbc3c3292a82b2f56ee Mon Sep 17 00:00:00 2001 From: Seraphys Date: Wed, 15 Oct 2025 13:20:03 -0500 Subject: [PATCH 02/10] tweak(format): Change Dolby Atmos Conditions --- custom_formats/Dolby Atmos.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/custom_formats/Dolby Atmos.yml b/custom_formats/Dolby Atmos.yml index df55416f..d82b1a66 100644 --- a/custom_formats/Dolby Atmos.yml +++ b/custom_formats/Dolby Atmos.yml @@ -7,8 +7,13 @@ conditions: - name: Atmos negate: false pattern: Atmos - required: true + required: false type: release_title +- name: Atmos (BTN Standard) + type: release_title + required: false + negate: false + pattern: BTN Atmos - name: Not TrueHD negate: true pattern: TrueHD From d1f88f18d83d2af010e1a28a8a336b6a1e3c0546 Mon Sep 17 00:00:00 2001 From: Seraphys Date: Wed, 15 Oct 2025 16:26:56 -0500 Subject: [PATCH 03/10] tweak(profile): Rescore 1080/720p Golden Popcorn Flags / Add Excep --- custom_formats/1080p Golden Popcorn.yml | 5 +++++ custom_formats/720p Golden Popcorn.yml | 5 +++++ profiles/1080p Balanced+.yml | 2 +- profiles/1080p Balanced.yml | 2 +- profiles/1080p Efficient+.yml | 2 +- profiles/1080p Efficient.yml | 2 +- profiles/1080p Quality (HDR).yml | 2 ++ profiles/1080p Quality.yml | 4 +++- profiles/1080p Remux.yml | 4 +++- profiles/2160p Balanced.yml | 4 +++- profiles/2160p Efficient.yml | 2 +- profiles/2160p Quality.yml | 4 +++- profiles/2160p Remux.yml | 4 +++- profiles/720p Quality.yml | 2 +- regex_patterns/Golden Popcorn Negation.yml | 5 +++++ regex_patterns/UHD Bluray Release Groups.yml | 2 +- 16 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 regex_patterns/Golden Popcorn Negation.yml diff --git a/custom_formats/1080p Golden Popcorn.yml b/custom_formats/1080p Golden Popcorn.yml index f028c8b8..2622fdc7 100644 --- a/custom_formats/1080p Golden Popcorn.yml +++ b/custom_formats/1080p Golden Popcorn.yml @@ -14,4 +14,9 @@ conditions: negate: false required: true type: indexer_flag +- name: Release Groups + type: release_group + required: true + negate: true + pattern: Golden Popcorn Negation tests: [] diff --git a/custom_formats/720p Golden Popcorn.yml b/custom_formats/720p Golden Popcorn.yml index 7eb75cd7..e56c19ad 100644 --- a/custom_formats/720p Golden Popcorn.yml +++ b/custom_formats/720p Golden Popcorn.yml @@ -14,4 +14,9 @@ conditions: negate: false required: true type: indexer_flag +- name: Release Groups + type: release_group + required: true + negate: true + pattern: Golden Popcorn Negation tests: [] diff --git a/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml index b32b78aa..477ce5cf 100644 --- a/profiles/1080p Balanced+.yml +++ b/profiles/1080p Balanced+.yml @@ -169,7 +169,7 @@ custom_formats: score: -999999 custom_formats_radarr: - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml index 984ce6a2..b2094598 100644 --- a/profiles/1080p Balanced.yml +++ b/profiles/1080p Balanced.yml @@ -161,7 +161,7 @@ custom_formats: score: -999999 custom_formats_radarr: - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/profiles/1080p Efficient+.yml b/profiles/1080p Efficient+.yml index 87468391..582088b4 100644 --- a/profiles/1080p Efficient+.yml +++ b/profiles/1080p Efficient+.yml @@ -199,7 +199,7 @@ custom_formats_radarr: - name: 1080p Efficient+ Movie WEB Tier 4 score: 160000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index c371eea1..46971e9b 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -196,7 +196,7 @@ custom_formats_radarr: - name: 1080p Efficient Movie WEB Tier 4 score: 160000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml index a41772f2..3cfd2536 100644 --- a/profiles/1080p Quality (HDR).yml +++ b/profiles/1080p Quality (HDR).yml @@ -182,6 +182,8 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: +- name: 1080p Golden Popcorn + score: 80000 - name: 720p Golden Popcorn score: 6000 - name: MA diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index 555d01be..4c31081f 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -169,8 +169,10 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: +- name: 1080p Golden Popcorn + score: 80000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml index 4f8e3217..712cdf1d 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -212,8 +212,10 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: +- name: 1080p Golden Popcorn + score: 80000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index b7597716..1997fd32 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -180,8 +180,10 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: +- name: 1080p Golden Popcorn + score: 80000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml index 3841b093..5885554b 100644 --- a/profiles/2160p Efficient.yml +++ b/profiles/2160p Efficient.yml @@ -198,7 +198,7 @@ custom_formats_radarr: - name: 1080p Efficient+ Movie WEB Tier 4 score: 160000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 2d1e1c5b..464c740a 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -214,8 +214,10 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: +- name: 1080p Golden Popcorn + score: 80000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index 08bf5f37..ab0fc9ed 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -230,8 +230,10 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: +- name: 1080p Golden Popcorn + score: 80000 - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index dc049f44..ca53b4e0 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -150,7 +150,7 @@ custom_formats: score: -999999 custom_formats_radarr: - name: 720p Golden Popcorn - score: 6000 + score: 40000 - name: MA score: 4000 - name: SD Golden Popcorn diff --git a/regex_patterns/Golden Popcorn Negation.yml b/regex_patterns/Golden Popcorn Negation.yml new file mode 100644 index 00000000..0bf57492 --- /dev/null +++ b/regex_patterns/Golden Popcorn Negation.yml @@ -0,0 +1,5 @@ +name: Golden Popcorn Negation +pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BSTD|BV|c0kE|Chotab|CJ|coffee|CRiSC|CRX|CtrlHD|Dariush|de[42]|decibel|DON|D-Z0N3|E.N.D|E1|EDPH|EbP|ESiR|EuReKA|EXCiSION|FoRM|FraMeSToR|GALAXY|Geek|GS88|HANDJOB|hdalx|HDC|HDMaNiAcS|HiDt|HiFi|HiP|HQMUX|IDE|iFT|iON|Ivandro|KASHMiR|Kitsune|KnG|LEGi0N|LiNG|LolHD|LoRD|luvBB|MaG|MTeam|NCmt|NiBuRu|NiP|nmd|NTb|NyHD|ORiGEN|P0W4HD|Penumbra|playHD|Positive|PTer|PTP|REBORN|RiCO|rightSIZE|RO|ROCiNANTE|rttr|SA89|SaNcTi|SbR|SiMPLE|Skazhutin|Slappy|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|ThD|TnP|VLAD|VietHD|W4NK3R|WiKi|WiLDCAT|WiLF|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b +description: Match release groups who should not be categorized as UHD Bluray +tags: [] +tests: [] diff --git a/regex_patterns/UHD Bluray Release Groups.yml b/regex_patterns/UHD Bluray Release Groups.yml index 457bdfde..0d7ce030 100644 --- a/regex_patterns/UHD Bluray Release Groups.yml +++ b/regex_patterns/UHD Bluray Release Groups.yml @@ -1,5 +1,5 @@ name: UHD Bluray Release Groups -pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BSTD|BV|c0kE|Chotab|CJ|coffee|CRiSC|CRX|CtrlHD|Dariush|de[42]|decibel|DON|D-Z0N3|E.N.D|E1|EDPH|EbP|ESiR|EXCiSION|FoRM|FraMeSToR|GALAXY|Geek|GS88|hdalx|HDMaNiAcS|HiDt|HiFi|HiP|IDE|iFT|KASHMiR|Kitsune|LEGi0N|LiNG|LolHD|LoRD|luvBB|NCmt|NiBuRu|nmd|NTb|NyHD|ORiGEN|Penumbra|playHD|Positive|PTer|REBORN|RiCO|rightSIZE|RO|rttr|SA89|SaNcTi|SbR|SiMPLE|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|TnP|VLAD|VietHD|W4NK3R|WiLF|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b +pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BSTD|BV|c0kE|Chotab|CJ|coffee|CRiSC|CRX|CtrlHD|Dariush|de[42]|decibel|DON|D-Z0N3|E.N.D|E1|EA|EDPH|EbP|ESiR|EXCiSION|FoRM|FraMeSToR|GALAXY|Geek|GS88|hdalx|HDMaNiAcS|HiDt|HiFi|HiP|IDE|iFT|KASHMiR|Kitsune|LEGi0N|LiNG|LolHD|LoRD|luvBB|NCmt|NiBuRu|nmd|NTb|NyHD|ORiGEN|Penumbra|playHD|Positive|PTer|REBORN|RiCO|rightSIZE|RO|rttr|SA89|SaNcTi|SbR|SiMPLE|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|TnP|VLAD|VietHD|W4NK3R|WiLF|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b description: Match release groups who should not be categorized as UHD Bluray tags: [] tests: [] From 25bf4c484c52b78ff5df259c4733e73b18778b41 Mon Sep 17 00:00:00 2001 From: Seraphys Date: Wed, 15 Oct 2025 16:32:57 -0500 Subject: [PATCH 04/10] tweak(profile): Remove SD Popcorns as no 480p Blurays Tiers --- profiles/1080p Balanced+.yml | 2 -- profiles/1080p Balanced.yml | 2 -- profiles/1080p Efficient+.yml | 2 -- profiles/1080p Efficient.yml | 2 -- profiles/1080p Quality (HDR).yml | 2 -- profiles/1080p Quality.yml | 2 -- profiles/1080p Remux.yml | 2 -- profiles/2160p Balanced.yml | 2 -- profiles/2160p Efficient.yml | 2 -- profiles/2160p Quality.yml | 2 -- profiles/2160p Remux.yml | 2 -- profiles/720p Quality.yml | 2 -- 12 files changed, 24 deletions(-) diff --git a/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml index 477ce5cf..530b0fff 100644 --- a/profiles/1080p Balanced+.yml +++ b/profiles/1080p Balanced+.yml @@ -172,8 +172,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml index b2094598..f7846517 100644 --- a/profiles/1080p Balanced.yml +++ b/profiles/1080p Balanced.yml @@ -164,8 +164,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT diff --git a/profiles/1080p Efficient+.yml b/profiles/1080p Efficient+.yml index 582088b4..30b9a3c8 100644 --- a/profiles/1080p Efficient+.yml +++ b/profiles/1080p Efficient+.yml @@ -202,8 +202,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index 46971e9b..d754ace5 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -199,8 +199,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: AMZN score: 3000 - name: Better Theatricals diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml index 3cfd2536..5b4790f7 100644 --- a/profiles/1080p Quality (HDR).yml +++ b/profiles/1080p Quality (HDR).yml @@ -188,8 +188,6 @@ custom_formats_radarr: score: 6000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index 4c31081f..a00b4b64 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -175,8 +175,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml index 712cdf1d..aca4ab53 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -218,8 +218,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index 1997fd32..ae72160d 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -192,8 +192,6 @@ custom_formats_radarr: score: 4000 - name: iT score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Amazon Enhancement score: 2000 - name: HMAX diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml index 5885554b..fe6f8aae 100644 --- a/profiles/2160p Efficient.yml +++ b/profiles/2160p Efficient.yml @@ -207,8 +207,6 @@ custom_formats_radarr: score: 4000 - name: iT score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Amazon Enhancement score: 2000 - name: HMAX diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 464c740a..3cce33b3 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -226,8 +226,6 @@ custom_formats_radarr: score: 4000 - name: iT score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Amazon Enhancement score: 2000 - name: HMAX diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index ab0fc9ed..7a3ca8d1 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -242,8 +242,6 @@ custom_formats_radarr: score: 4000 - name: iT score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Amazon Enhancement score: 2000 - name: HMAX diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index ca53b4e0..9938b34d 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -153,8 +153,6 @@ custom_formats_radarr: score: 40000 - name: MA score: 4000 -- name: SD Golden Popcorn - score: 4000 - name: Better Theatricals score: 1000 - name: CRIT From bb5e8d227a87f03651649a80e0555803df57f1a8 Mon Sep 17 00:00:00 2001 From: Seraphys Date: Wed, 15 Oct 2025 18:06:49 -0500 Subject: [PATCH 05/10] tweak(profile): Remove Popcorn Flags Radarr Unsupported --- profiles/1080p Balanced+.yml | 2 -- profiles/1080p Balanced.yml | 2 -- profiles/1080p Efficient+.yml | 2 -- profiles/1080p Efficient.yml | 2 -- profiles/1080p Quality (HDR).yml | 4 ---- profiles/1080p Quality.yml | 4 ---- profiles/1080p Remux.yml | 4 ---- profiles/2160p Balanced.yml | 4 ---- profiles/2160p Efficient.yml | 2 -- profiles/2160p Quality.yml | 4 ---- profiles/2160p Remux.yml | 4 ---- profiles/720p Quality.yml | 2 -- 12 files changed, 36 deletions(-) diff --git a/profiles/1080p Balanced+.yml b/profiles/1080p Balanced+.yml index 530b0fff..40d34e89 100644 --- a/profiles/1080p Balanced+.yml +++ b/profiles/1080p Balanced+.yml @@ -168,8 +168,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: Better Theatricals diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml index f7846517..0e2530d4 100644 --- a/profiles/1080p Balanced.yml +++ b/profiles/1080p Balanced.yml @@ -160,8 +160,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: Better Theatricals diff --git a/profiles/1080p Efficient+.yml b/profiles/1080p Efficient+.yml index 30b9a3c8..0814433a 100644 --- a/profiles/1080p Efficient+.yml +++ b/profiles/1080p Efficient+.yml @@ -198,8 +198,6 @@ custom_formats_radarr: score: 161000 - name: 1080p Efficient+ Movie WEB Tier 4 score: 160000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: Better Theatricals diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index d754ace5..00199d47 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -195,8 +195,6 @@ custom_formats_radarr: score: 161000 - name: 1080p Efficient Movie WEB Tier 4 score: 160000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: AMZN diff --git a/profiles/1080p Quality (HDR).yml b/profiles/1080p Quality (HDR).yml index 5b4790f7..29762d4a 100644 --- a/profiles/1080p Quality (HDR).yml +++ b/profiles/1080p Quality (HDR).yml @@ -182,10 +182,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 80000 -- name: 720p Golden Popcorn - score: 6000 - name: MA score: 4000 - name: Better Theatricals diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index a00b4b64..3aa1262e 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -169,10 +169,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 80000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: Better Theatricals diff --git a/profiles/1080p Remux.yml b/profiles/1080p Remux.yml index aca4ab53..f64916fe 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -212,10 +212,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 80000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: Better Theatricals diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index ae72160d..253741fd 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -180,10 +180,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 80000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml index fe6f8aae..138dff53 100644 --- a/profiles/2160p Efficient.yml +++ b/profiles/2160p Efficient.yml @@ -197,8 +197,6 @@ custom_formats_radarr: score: 161000 - name: 1080p Efficient+ Movie WEB Tier 4 score: 160000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index 3cce33b3..9b33a92e 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -214,10 +214,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 80000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index 7a3ca8d1..902b8742 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -230,10 +230,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 1080p Golden Popcorn - score: 80000 -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 6000 - name: ATVP diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index 9938b34d..67079285 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -149,8 +149,6 @@ custom_formats: - name: Xvid score: -999999 custom_formats_radarr: -- name: 720p Golden Popcorn - score: 40000 - name: MA score: 4000 - name: Better Theatricals From ceb6a76faf2db48b3c79c28119185e4b18110c98 Mon Sep 17 00:00:00 2001 From: Seraphys Date: Fri, 17 Oct 2025 23:02:36 -0500 Subject: [PATCH 06/10] tweak(format): Revert Dolby Atmos Borked --- custom_formats/Dolby Atmos.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/custom_formats/Dolby Atmos.yml b/custom_formats/Dolby Atmos.yml index d82b1a66..df55416f 100644 --- a/custom_formats/Dolby Atmos.yml +++ b/custom_formats/Dolby Atmos.yml @@ -7,13 +7,8 @@ conditions: - name: Atmos negate: false pattern: Atmos - required: false + required: true type: release_title -- name: Atmos (BTN Standard) - type: release_title - required: false - negate: false - pattern: BTN Atmos - name: Not TrueHD negate: true pattern: TrueHD From 9fe0c17f4906e988c39e12da97474b65c442684a Mon Sep 17 00:00:00 2001 From: Seraphys Date: Fri, 17 Oct 2025 23:15:51 -0500 Subject: [PATCH 07/10] tweak(format): Fix Dolby Atmos --- custom_formats/Dolby Atmos.yml | 4 ++-- regex_patterns/Dolby Atmos.yml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 regex_patterns/Dolby Atmos.yml diff --git a/custom_formats/Dolby Atmos.yml b/custom_formats/Dolby Atmos.yml index df55416f..49dbd4ee 100644 --- a/custom_formats/Dolby Atmos.yml +++ b/custom_formats/Dolby Atmos.yml @@ -4,9 +4,9 @@ tags: - Audio - Dolby conditions: -- name: Atmos +- name: Dolby Atmos negate: false - pattern: Atmos + pattern: Dolby Atmos required: true type: release_title - name: Not TrueHD diff --git a/regex_patterns/Dolby Atmos.yml b/regex_patterns/Dolby Atmos.yml new file mode 100644 index 00000000..16596d7f --- /dev/null +++ b/regex_patterns/Dolby Atmos.yml @@ -0,0 +1,34 @@ +name: Dolby Atmos +pattern: \bATMOS(\b|\d)|\bDDPA[57]\.1\b +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: true +- id: 5 + input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP + expected: false +- id: 6 + input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR + expected: true +- id: 7 + input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX + expected: true +- id: 8 + input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX + expected: true +- id: 9 + input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI + expected: false From 6c6d89fe174318880ee3f21b22c51ae72375c5dc Mon Sep 17 00:00:00 2001 From: Seraphys Date: Sat, 18 Oct 2025 21:15:47 -0500 Subject: [PATCH 08/10] tweak(profile): Remove TAoE Blurays from Regular Efficient - Oversized --- custom_formats/1080p Efficient TV Bluray Tier 1.yml | 5 ----- profiles/1080p Efficient.yml | 2 -- 2 files changed, 7 deletions(-) diff --git a/custom_formats/1080p Efficient TV Bluray Tier 1.yml b/custom_formats/1080p Efficient TV Bluray Tier 1.yml index 083dd098..98107bcb 100644 --- a/custom_formats/1080p Efficient TV Bluray Tier 1.yml +++ b/custom_formats/1080p Efficient TV Bluray Tier 1.yml @@ -26,11 +26,6 @@ conditions: pattern: QxR required: false type: release_group -- name: TAoE - negate: false - pattern: TAoE - required: false - type: release_group tests: - conditionResults: - matches: true diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index 00199d47..d5809392 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -224,8 +224,6 @@ custom_formats_sonarr: score: 184000 - name: QxR Bluray score: 184000 -- name: TAoE Bluray - score: 184000 - name: 1080p Efficient TV Bluray Tier 2 score: 183000 - name: 1080p Efficient TV Bluray Tier 3 From ff792f6bc48854af6fbef2c4efe7bea2f3cc3c9f Mon Sep 17 00:00:00 2001 From: Seraphys Date: Sun, 19 Oct 2025 10:24:05 -0500 Subject: [PATCH 09/10] tweak(regex): Simplify Atmos --- custom_formats/Dolby Atmos.yml | 4 +-- regex_patterns/Atmos.yml | 44 ++++++---------------------- regex_patterns/BTN Atmos.yml | 53 +++++++--------------------------- regex_patterns/Dolby Atmos.yml | 34 ---------------------- 4 files changed, 22 insertions(+), 113 deletions(-) delete mode 100644 regex_patterns/Dolby Atmos.yml diff --git a/custom_formats/Dolby Atmos.yml b/custom_formats/Dolby Atmos.yml index 49dbd4ee..df55416f 100644 --- a/custom_formats/Dolby Atmos.yml +++ b/custom_formats/Dolby Atmos.yml @@ -4,9 +4,9 @@ tags: - Audio - Dolby conditions: -- name: Dolby Atmos +- name: Atmos negate: false - pattern: Dolby Atmos + pattern: Atmos required: true type: release_title - name: Not TrueHD diff --git a/regex_patterns/Atmos.yml b/regex_patterns/Atmos.yml index 50eada52..3aac28fe 100644 --- a/regex_patterns/Atmos.yml +++ b/regex_patterns/Atmos.yml @@ -1,45 +1,19 @@ name: Atmos -pattern: \bATMOS(\b|\d) +pattern: \bATMOS|DDPA(\b|\d) description: '' tags: - Audio - Enhancement tests: -- expected: false - id: 1 +- id: 1 input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP - lastRun: '2025-01-06T15:07:07.378833' - matchSpan: null - matchedContent: null - matchedGroups: [] - passes: true -- expected: true - id: 2 + expected: false +- id: 2 input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR - lastRun: '2025-01-06T15:07:07.378833' - matchSpan: - end: 48 - start: 43 - matchedContent: Atmos - matchedGroups: - - '' - passes: true -- expected: true - id: 3 + expected: true +- id: 3 input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX - lastRun: '2025-01-06T15:07:07.378833' - matchSpan: - end: 49 - start: 44 - matchedContent: Atmos - matchedGroups: - - '' - passes: true -- expected: false - id: 4 + expected: true +- id: 4 input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX - lastRun: '2025-01-06T15:07:07.378833' - matchSpan: null - matchedContent: null - matchedGroups: [] - passes: true + expected: true diff --git a/regex_patterns/BTN Atmos.yml b/regex_patterns/BTN Atmos.yml index ee6283f4..8847ccc5 100644 --- a/regex_patterns/BTN Atmos.yml +++ b/regex_patterns/BTN Atmos.yml @@ -1,52 +1,21 @@ name: BTN Atmos -pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1|DDPA[57]\.1\b +pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1 description: Matches BroadcastTheNet Atmos naming convention tags: - Audio tests: -- expected: true - id: 1 +- id: 1 input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP - lastRun: '2025-01-11T23:15:36.540509' - matchSpan: - end: 52 - start: 42 - matchedContent: TrueHDA7.1 - matchedGroups: [] - passes: true -- expected: false - id: 2 + expected: true +- id: 2 input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR - lastRun: '2025-01-11T23:15:36.540509' - matchSpan: null - matchedContent: null - matchedGroups: [] - passes: true -- expected: false - id: 3 + expected: false +- id: 3 input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX - lastRun: '2025-01-11T23:15:36.540509' - matchSpan: null - matchedContent: null - matchedGroups: [] - passes: true -- expected: true - id: 4 + expected: false +- id: 4 input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX - lastRun: '2025-01-11T23:15:36.540509' - matchSpan: - end: 50 - start: 43 - matchedContent: DDPA5.1 - matchedGroups: [] - passes: true -- expected: true - id: 5 + expected: false +- id: 5 input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI - lastRun: '2025-01-11T23:15:36.540509' - matchSpan: - end: 43 - start: 32 - matchedContent: TrueHDA.7.1 - matchedGroups: [] - passes: true + expected: true diff --git a/regex_patterns/Dolby Atmos.yml b/regex_patterns/Dolby Atmos.yml deleted file mode 100644 index 16596d7f..00000000 --- a/regex_patterns/Dolby Atmos.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Dolby Atmos -pattern: \bATMOS(\b|\d)|\bDDPA[57]\.1\b -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: true -- id: 5 - input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP - expected: false -- id: 6 - input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR - expected: true -- id: 7 - input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX - expected: true -- id: 8 - input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX - expected: true -- id: 9 - input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI - expected: false From 5383ca3c182706aebdaf9ae3eeb351cd617c135d Mon Sep 17 00:00:00 2001 From: Seraphys Date: Sun, 19 Oct 2025 16:00:06 -0500 Subject: [PATCH 10/10] tweak(regex): Add Celdra to QxR Regex --- regex_patterns/QxR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regex_patterns/QxR.yml b/regex_patterns/QxR.yml index f56c9d84..527ff661 100644 --- a/regex_patterns/QxR.yml +++ b/regex_patterns/QxR.yml @@ -1,5 +1,5 @@ name: QxR -pattern: (?<=^|[\s.-])(QxR|afm72|Bandi|FreetheFish|Garshasp|Ghost|Ime|Kappa|Langbard|LION|Panda|MONOLITH|Natty|r00t|RCVR|RZeroX|SAMPA|Silence|t3nzin|Tigole|YOGI)\b +pattern: (?<=^|[\s.-])(QxR|afm72|Bandi|Celdra|FreetheFish|Garshasp|Ghost|Ime|Kappa|Langbard|LION|Panda|MONOLITH|Natty|r00t|RCVR|RZeroX|SAMPA|Silence|t3nzin|Tigole|YOGI)\b description: '' tags: - Release Group