diff --git a/custom_formats/1080p Balanced Tier 1.yml b/custom_formats/1080p Balanced Tier 1.yml index d7819e2..acd5557 100644 --- a/custom_formats/1080p Balanced Tier 1.yml +++ b/custom_formats/1080p Balanced Tier 1.yml @@ -15,16 +15,11 @@ conditions: required: true source: bluray type: source -- name: BHDStudio - negate: false - pattern: BHDStudio - required: false - type: release_group - name: hallowed - type: release_group - required: false negate: false pattern: hallowed + required: false + type: release_group tests: - conditionResults: - matches: true diff --git a/custom_formats/1080p Balanced Tier 2.yml b/custom_formats/1080p Balanced Tier 2.yml new file mode 100644 index 0000000..8908b11 --- /dev/null +++ b/custom_formats/1080p Balanced Tier 2.yml @@ -0,0 +1,96 @@ +name: 1080p Balanced Tier 2 +description: Matches release groups who fall under 1080p Balanced Tier 2 +tags: +- Release Group Tier +- 1080p +- Balanced +conditions: +- name: 1080p + negate: false + required: true + resolution: 1080p + type: resolution +- name: Bluray + negate: false + required: true + source: bluray + type: source +- 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/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/custom_formats/Amazon Enhancement.yml b/custom_formats/Amazon Enhancement.yml index 0ba50e2..7b3b2d2 100644 --- a/custom_formats/Amazon Enhancement.yml +++ b/custom_formats/Amazon Enhancement.yml @@ -11,6 +11,6 @@ conditions: - name: AMZN negate: false pattern: Amazon Prime - required: false + required: true type: release_title tests: [] diff --git a/custom_formats/Banned Groups (Efficient).yml b/custom_formats/Banned Groups (Efficient).yml index 402d81a..383352f 100644 --- a/custom_formats/Banned Groups (Efficient).yml +++ b/custom_formats/Banned Groups (Efficient).yml @@ -174,11 +174,16 @@ conditions: pattern: TvR required: false type: release_group -- name: VD0N +- name: UnKn0wn type: release_group required: false + negate: false + pattern: UnKn0wn +- name: VD0N negate: false pattern: VD0N + required: false + type: release_group - name: VECTOR negate: false pattern: VECTOR diff --git a/custom_formats/Banned Groups.yml b/custom_formats/Banned Groups.yml index ff0408c..d5938fd 100644 --- a/custom_formats/Banned Groups.yml +++ b/custom_formats/Banned Groups.yml @@ -199,6 +199,11 @@ conditions: pattern: TvR required: false type: release_group +- name: UnKn0wn + negate: false + pattern: UnKn0wn + required: false + type: release_group - name: VD0N negate: false pattern: VD0N diff --git a/custom_formats/Disney+ Enhancement.yml b/custom_formats/Disney+ Enhancement.yml new file mode 100644 index 0000000..2bce8fd --- /dev/null +++ b/custom_formats/Disney+ Enhancement.yml @@ -0,0 +1,16 @@ +name: Disney+ Enhancement +description: '' +tags: +- Enhancement +conditions: +- name: Not 2160p + negate: true + required: true + resolution: 2160p + type: resolution +- name: DSNP + negate: false + pattern: Disney+ + required: true + type: release_title +tests: [] diff --git a/custom_formats/MUBI.yml b/custom_formats/MUBI.yml new file mode 100644 index 0000000..d748862 --- /dev/null +++ b/custom_formats/MUBI.yml @@ -0,0 +1,59 @@ +name: MUBI +description: Matches 'Mubi' WEB-DLs. Negates any encodes. +tags: +- Streaming Service +- WEB-DL +conditions: +- name: MUBI Regex + negate: false + pattern: Mubi + 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: AMZN Regex + negate: false + pattern: Amazon Prime + required: true + type: release_title + - matches: true + name: x265 + negate: true + pattern: x265 + required: false + type: release_title + expected: false + id: 1 + input: The Bad Guys (2022) (1080p AMZN Webrip x265 10bit EAC3 5 1 - ArcX)[TAoE] + lastRun: '2025-01-14T09:45:16.007149' + passes: true +- conditionResults: + - matches: true + name: AMZN Regex + negate: false + pattern: Amazon Prime + required: true + type: release_title + - matches: true + name: x265 + negate: true + pattern: x265 + required: false + type: release_title + expected: false + id: 2 + input: Top Gun Maverick (2022) IMAX (1080p AMZN WEB-DL x265 SDR DDP Atmos 5.1 English + - Goki TAoE) + lastRun: '2025-01-14T09:45:16.007149' + passes: true diff --git a/custom_formats/Movies Anywhere Enhancement.yml b/custom_formats/Movies Anywhere Enhancement.yml new file mode 100644 index 0000000..f401f6d --- /dev/null +++ b/custom_formats/Movies Anywhere Enhancement.yml @@ -0,0 +1,16 @@ +name: Movies Anywhere Enhancement +description: '' +tags: +- Enhancement +conditions: +- name: Not 2160p + negate: true + required: true + resolution: 2160p + type: resolution +- name: MA + negate: false + pattern: Movies Anywhere + required: true + type: release_title +tests: [] diff --git a/custom_formats/WEB-DL Tier 1.yml b/custom_formats/WEB-DL Tier 1.yml index 5b9965c..a5ff9d0 100644 --- a/custom_formats/WEB-DL Tier 1.yml +++ b/custom_formats/WEB-DL Tier 1.yml @@ -19,4 +19,9 @@ conditions: pattern: NTb required: false type: release_group +- name: TheFarm + type: release_group + required: false + negate: false + pattern: TheFarm tests: [] diff --git a/custom_formats/WEB-DL Tier 2.yml b/custom_formats/WEB-DL Tier 2.yml index 2ce75d2..0642872 100644 --- a/custom_formats/WEB-DL Tier 2.yml +++ b/custom_formats/WEB-DL Tier 2.yml @@ -19,11 +19,6 @@ conditions: pattern: CMRG required: false type: release_group -- name: HHWEB - negate: false - pattern: HHWEB - required: false - type: release_group - name: HONE negate: false pattern: HONE @@ -44,9 +39,4 @@ conditions: pattern: TEPES required: false type: release_group -- name: TheFarm - type: release_group - required: false - negate: false - pattern: TheFarm tests: [] diff --git a/custom_formats/WEB-DL Tier 3.yml b/custom_formats/WEB-DL Tier 3.yml index 7f103b3..4a5d7e9 100644 --- a/custom_formats/WEB-DL Tier 3.yml +++ b/custom_formats/WEB-DL Tier 3.yml @@ -49,6 +49,11 @@ conditions: pattern: CtrlHD required: false type: release_group +- name: HHWEB + type: release_group + required: false + negate: false + pattern: HHWEB - name: KHN negate: false pattern: KHN diff --git a/custom_formats/Weasley WEB.yml b/custom_formats/Weasley WEB.yml new file mode 100644 index 0000000..643fe31 --- /dev/null +++ b/custom_formats/Weasley WEB.yml @@ -0,0 +1,25 @@ +name: Weasley WEB +description: '' +tags: [] +conditions: +- name: 1080p + negate: false + required: true + resolution: 1080p + type: resolution +- name: Weasley + negate: false + pattern: Weasley + 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: [] diff --git a/custom_formats/iTunes Enhancement.yml b/custom_formats/iTunes Enhancement.yml index ecf78a8..e31e10d 100644 --- a/custom_formats/iTunes Enhancement.yml +++ b/custom_formats/iTunes Enhancement.yml @@ -11,6 +11,6 @@ conditions: - name: iT negate: false pattern: iTunes - required: false + required: true type: release_title tests: [] diff --git a/profiles/1080p Balanced.yml b/profiles/1080p Balanced.yml index 3bdd445..44dc02d 100644 --- a/profiles/1080p Balanced.yml +++ b/profiles/1080p Balanced.yml @@ -22,6 +22,8 @@ upgradeUntilScore: 600000 minScoreIncrement: 1 custom_formats: - name: 1080p Balanced Tier 1 + score: 281000 +- name: 1080p Balanced Tier 2 score: 280000 - name: 1080p WEB-DL score: 280000 @@ -77,16 +79,14 @@ custom_formats: score: 10000 - name: AMZN score: 3000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: iT score: 1000 - name: NF @@ -125,14 +125,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -153,6 +155,8 @@ custom_formats: score: -999999 - name: Banned WEBRip score: -999999 +- name: BCORE + score: -999999 - name: Dolby Vision score: -999999 - name: Full Disc @@ -184,8 +188,6 @@ custom_formats_radarr: score: 4000 - 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 a42460c..c143b92 100644 --- a/profiles/1080p Compact.yml +++ b/profiles/1080p Compact.yml @@ -21,6 +21,8 @@ upgradeUntilScore: 600000 minScoreIncrement: 1 custom_formats: - name: 1080p Balanced Tier 1 + score: 281000 +- name: 1080p Balanced Tier 2 score: 280000 - name: 1080p WEB-DL (h264) score: 280000 @@ -74,20 +76,18 @@ custom_formats: score: 11000 - name: SD Quality Tier 2 score: 10000 -- name: ATVP - score: 3000 - name: Dolby Vision score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: DS4K score: 1000 - name: HDR @@ -136,14 +136,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -164,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 @@ -205,6 +209,8 @@ custom_formats_radarr: score: 303000 - name: TAoE WEB score: 303000 +- name: Weasley WEB + score: 303000 - name: 1080p Compact Movie WEB Tier 2 score: 302000 - name: 1080p Compact Movie WEB Tier 3 @@ -217,8 +223,6 @@ custom_formats_radarr: score: 3000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D @@ -256,6 +260,8 @@ custom_formats_sonarr: score: 309000 - name: Vialle WEB score: 309000 +- name: Weasley WEB + score: 309000 - name: 1080p Compact TV WEB Tier 2 score: 308000 - name: 1080p Compact TV WEB Tier 3 diff --git a/profiles/1080p Efficient.yml b/profiles/1080p Efficient.yml index fb2f4c7..359828e 100644 --- a/profiles/1080p Efficient.yml +++ b/profiles/1080p Efficient.yml @@ -28,6 +28,8 @@ custom_formats: - name: TAoE Bluray score: 324000 - name: 1080p Balanced Tier 1 + score: 281000 +- name: 1080p Balanced Tier 2 score: 280000 - name: 1080p WEB-DL (h264) score: 280000 @@ -83,20 +85,18 @@ custom_formats: score: 10000 - name: AMZN score: 3000 -- name: ATVP - score: 3000 - name: Dolby Vision score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: DS4K score: 1000 - name: HDR @@ -145,14 +145,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -173,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 @@ -210,6 +214,8 @@ custom_formats_radarr: score: 303000 - name: TAoE WEB score: 303000 +- name: Weasley WEB + score: 303000 - name: 1080p Efficient Movie WEB Tier 2 score: 302000 - name: 1080p Efficient Movie WEB Tier 3 @@ -220,8 +226,6 @@ custom_formats_radarr: score: 4000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D @@ -259,6 +263,8 @@ custom_formats_sonarr: score: 307000 - name: Vialle WEB score: 307000 +- name: Weasley WEB + score: 307000 - name: 1080p Efficient TV WEB Tier 2 score: 306000 - name: 1080p Efficient TV WEB Tier 3 diff --git a/profiles/1080p Quality HDR.yml b/profiles/1080p Quality HDR.yml index 48deccd..22d3d4b 100644 --- a/profiles/1080p Quality HDR.yml +++ b/profiles/1080p Quality HDR.yml @@ -44,6 +44,8 @@ custom_formats: - name: 576p Bluray score: 120000 - name: 1080p Balanced Tier 1 + score: 101000 +- name: 1080p Balanced Tier 2 score: 100000 - name: 720p Quality Tier 1 score: 85000 @@ -89,20 +91,18 @@ custom_formats: score: 10000 - name: AMZN score: 3000 -- name: ATVP - score: 3000 - name: Dolby Vision score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) @@ -151,14 +151,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -183,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 @@ -204,8 +208,6 @@ custom_formats_radarr: score: 4000 - 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 95ea4c0..f6f9808 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -41,6 +41,8 @@ custom_formats: - name: 576p Bluray score: 120000 - name: 1080p Balanced Tier 1 + score: 101000 +- name: 1080p Balanced Tier 2 score: 100000 - name: 720p Quality Tier 1 score: 85000 @@ -86,16 +88,14 @@ custom_formats: score: 10000 - name: AMZN score: 3000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: iT score: 1000 - name: NF @@ -134,14 +134,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -162,6 +164,8 @@ custom_formats: score: -999999 - name: Banned WEBRip score: -999999 +- name: BCORE + score: -999999 - name: Dolby Vision score: -999999 - name: Full Disc @@ -193,8 +197,6 @@ custom_formats_radarr: score: 4000 - 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 40092a2..d7de042 100644 --- a/profiles/1080p Remux.yml +++ b/profiles/1080p Remux.yml @@ -52,6 +52,8 @@ custom_formats: - name: 576p Bluray score: 120000 - name: 1080p Balanced Tier 1 + score: 101000 +- name: 1080p Balanced Tier 2 score: 100000 - name: 720p Quality Tier 1 score: 85000 @@ -97,12 +99,12 @@ custom_formats: score: 10000 - name: AMZN score: 3000 -- name: ATVP - score: 3000 - name: Dolby Vision score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: HMAX @@ -115,8 +117,6 @@ custom_formats: score: 1200 - name: TrueHD score: 1200 -- name: ATV - score: 1000 - name: HDR score: 1000 - name: HDR (Missing) @@ -177,14 +177,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -211,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 @@ -232,8 +236,6 @@ custom_formats_radarr: score: 4000 - 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 876ce9f..481aeeb 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -48,6 +48,8 @@ custom_formats: - name: 576p Bluray score: 120000 - name: 1080p Balanced Tier 1 + score: 101000 +- name: 1080p Balanced Tier 2 score: 100000 - name: 720p Quality Tier 1 score: 85000 @@ -95,6 +97,8 @@ custom_formats: score: 3000 - name: AMZN score: 2000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: DTS-X @@ -105,7 +109,7 @@ custom_formats: score: 1200 - name: TrueHD (Missing) score: 1200 -- name: ATV +- name: Amazon Enhancement score: 1000 - name: HDR score: 1000 @@ -161,10 +165,14 @@ custom_formats: score: 0 - name: CRAV score: 0 +- name: CRIT + score: 0 - name: HTSR score: 0 - name: HULU score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -212,24 +220,22 @@ custom_formats_radarr: score: 442000 - name: MA score: 6000 -- name: ATVP - score: 4000 - name: DSNP score: 4000 - name: iT score: 4000 -- name: Amazon Enhancement - score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 +- name: Disney+ Enhancement + score: -1000 +- name: Movies Anywhere Enhancement + score: -2000 - name: iTunes Enhancement score: -3000 - name: 3D @@ -249,16 +255,12 @@ custom_formats_radarr: custom_formats_sonarr: - name: 2160p Balanced Tier 1 score: 444000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 - name: HMAX score: 3000 - name: MAX score: 3000 -- name: Amazon Enhancement - score: 1000 - name: iT score: 1000 - name: Season Pack diff --git a/profiles/2160p Efficient.yml b/profiles/2160p Efficient.yml index c1c6042..fa2e6b5 100644 --- a/profiles/2160p Efficient.yml +++ b/profiles/2160p Efficient.yml @@ -33,6 +33,8 @@ custom_formats: - name: TAoE Bluray score: 324000 - name: 1080p Balanced Tier 1 + score: 281000 +- name: 1080p Balanced Tier 2 score: 280000 - name: 1080p WEB-DL (h264) score: 280000 @@ -90,9 +92,11 @@ custom_formats: score: 3000 - name: AMZN score: 2000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 -- name: ATV +- name: Amazon Enhancement score: 1000 - name: DS4K score: 1000 @@ -144,10 +148,14 @@ custom_formats: score: 0 - name: CRAV score: 0 +- name: CRIT + score: 0 - name: HTSR score: 0 - name: HULU score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -209,6 +217,8 @@ custom_formats_radarr: score: 303000 - name: TAoE WEB score: 303000 +- name: Weasley WEB + score: 303000 - name: 1080p Efficient Movie WEB Tier 2 score: 302000 - name: 1080p Efficient Movie WEB Tier 3 @@ -217,24 +227,22 @@ custom_formats_radarr: score: 300000 - name: MA score: 6000 -- name: ATVP - score: 4000 - name: DSNP score: 4000 - name: iT score: 4000 -- name: Amazon Enhancement - score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 +- name: Disney+ Enhancement + score: -1000 +- name: Movies Anywhere Enhancement + score: -2000 - name: iTunes Enhancement score: -3000 - name: 3D @@ -286,6 +294,8 @@ custom_formats_sonarr: score: 307000 - name: Vialle WEB score: 307000 +- name: Weasley WEB + score: 307000 - name: 1080p Efficient TV WEB Tier 2 score: 306000 - name: 1080p Efficient TV WEB Tier 3 @@ -300,16 +310,12 @@ custom_formats_sonarr: score: 301000 - name: 1080p Efficient TV WEB Tier 6 score: 300000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 - name: HMAX score: 3000 - name: MAX score: 3000 -- name: Amazon Enhancement - score: 1000 - name: iT score: 1000 - name: Season Pack diff --git a/profiles/2160p Quality.yml b/profiles/2160p Quality.yml index a5aeaeb..8a910c2 100644 --- a/profiles/2160p Quality.yml +++ b/profiles/2160p Quality.yml @@ -66,6 +66,8 @@ custom_formats: - name: 576p Bluray score: 120000 - name: 1080p Balanced Tier 1 + score: 101000 +- name: 1080p Balanced Tier 2 score: 100000 - name: 720p Quality Tier 1 score: 85000 @@ -113,6 +115,8 @@ custom_formats: score: 3000 - name: AMZN score: 2000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: DTS-X @@ -123,7 +127,7 @@ custom_formats: score: 1200 - name: TrueHD (Missing) score: 1200 -- name: ATV +- name: Amazon Enhancement score: 1000 - name: HDR score: 1000 @@ -181,10 +185,14 @@ custom_formats: score: 0 - name: CRAV score: 0 +- name: CRIT + score: 0 - name: HTSR score: 0 - name: HULU score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -234,24 +242,22 @@ custom_formats_radarr: score: 442000 - name: MA score: 6000 -- name: ATVP - score: 4000 - name: DSNP score: 4000 - name: iT score: 4000 -- name: Amazon Enhancement - score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 +- name: Disney+ Enhancement + score: -1000 +- name: Movies Anywhere Enhancement + score: -2000 - name: iTunes Enhancement score: -3000 - name: 3D @@ -271,16 +277,12 @@ custom_formats_radarr: custom_formats_sonarr: - name: 2160p Balanced Tier 1 score: 444000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 - name: HMAX score: 3000 - name: MAX score: 3000 -- name: Amazon Enhancement - score: 1000 - name: iT score: 1000 - name: Season Pack diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index 552d4d6..074506e 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -70,6 +70,8 @@ custom_formats: - name: 576p Bluray score: 120000 - name: 1080p Balanced Tier 1 + score: 101000 +- name: 1080p Balanced Tier 2 score: 100000 - name: 720p Quality Tier 1 score: 85000 @@ -117,6 +119,8 @@ custom_formats: score: 3000 - name: AMZN score: 2000 +- name: ATVP + score: 2000 - name: HDR10+ score: 2000 - name: DTS-X @@ -127,7 +131,7 @@ custom_formats: score: 1200 - name: TrueHD (Missing) score: 1200 -- name: ATV +- name: Amazon Enhancement score: 1000 - name: HDR score: 1000 @@ -193,10 +197,14 @@ custom_formats: score: 0 - name: CRAV score: 0 +- name: CRIT + score: 0 - name: HTSR score: 0 - name: HULU score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -248,24 +256,22 @@ custom_formats_radarr: score: 462000 - name: MA score: 6000 -- name: ATVP - score: 4000 - name: DSNP score: 4000 - name: iT score: 4000 -- name: Amazon Enhancement - score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 +- name: Disney+ Enhancement + score: -1000 +- name: Movies Anywhere Enhancement + score: -2000 - name: iTunes Enhancement score: -3000 - name: 3D @@ -283,16 +289,12 @@ custom_formats_radarr: custom_formats_sonarr: - name: 2160p Balanced Tier 1 score: 464000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 - name: HMAX score: 3000 - name: MAX score: 3000 -- name: Amazon Enhancement - score: 1000 - name: iT score: 1000 - name: Season Pack diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index c4319a0..c16e5c1 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -66,16 +66,14 @@ custom_formats: score: 10000 - name: AMZN score: 3000 -- name: ATVP - score: 3000 - name: DSNP score: 3000 +- name: ATVP + score: 2000 - name: HMAX score: 2000 - name: MAX score: 2000 -- name: ATV - score: 1000 - name: iT score: 1000 - name: NF @@ -114,14 +112,16 @@ 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 score: 0 +- name: MUBI + score: 0 - name: NOW score: 0 - name: PCOK @@ -142,6 +142,8 @@ custom_formats: score: -999999 - name: Banned WEBRip score: -999999 +- name: BCORE + score: -999999 - name: Dolby Vision score: -999999 - name: Full Disc @@ -173,8 +175,6 @@ custom_formats_radarr: score: 4000 - name: Better Theatricals score: 1000 -- name: CRIT - score: 1000 - name: Special Edition score: 1000 - name: 3D diff --git a/regex_patterns/5.1 Surround.yml b/regex_patterns/5.1 Surround.yml new file mode 100644 index 0000000..632743e --- /dev/null +++ b/regex_patterns/5.1 Surround.yml @@ -0,0 +1,7 @@ +name: 5.1 Surround +pattern: \D5\.1\D +description: '' +tags: +- Audio +- Channel +tests: [] 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: [] diff --git a/regex_patterns/Mubi.yml b/regex_patterns/Mubi.yml new file mode 100644 index 0000000..be4f68d --- /dev/null +++ b/regex_patterns/Mubi.yml @@ -0,0 +1,10 @@ +name: Mubi +pattern: \b(MUBI)\b +description: Mubi is a British streaming platform, production company and film distributor. + Mubi produces and theatrically distributes films by emerging and established filmmakers, + which are exclusively available on its platform. The catalogue consists of world + cinema films, such as arthouse, documentary and independent films. +tags: +- Streaming Service +- WEB-DL +tests: [] diff --git a/regex_patterns/UnKn0wn.yml b/regex_patterns/UnKn0wn.yml new file mode 100644 index 0000000..ccc0d8e --- /dev/null +++ b/regex_patterns/UnKn0wn.yml @@ -0,0 +1,7 @@ +name: UnKn0wn +pattern: (?<=^|[\s.-])ADE\b +description: '' +tags: +- Release Group +- Remux +tests: []