From aafafa66df720cbcad8894fb2b97a5719a07fa44 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 15:56:04 +0000 Subject: [PATCH 1/9] Add Proper2 condition --- docs/json/radarr/cf/repack2.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/json/radarr/cf/repack2.json b/docs/json/radarr/cf/repack2.json index a2b97d55e..ea8ce03de 100644 --- a/docs/json/radarr/cf/repack2.json +++ b/docs/json/radarr/cf/repack2.json @@ -1,6 +1,7 @@ { "trash_id": "ae43b294509409a6a13919dedd4764c4", "trash_score": "6", + "trash_regex": "https://regex101.com/r/kQ4oeP/1", "name": "Repack2", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -12,6 +13,15 @@ "fields": { "value": "\\b(Repack2)\\b" } + }, + { + "name": "Proper2", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Proper2)\\b" + } } ] } From e58c10191cca315d42a388e039d36b190a5ac9c3 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 15:57:47 +0000 Subject: [PATCH 2/9] Add proper2 condition --- docs/json/sonarr/cf/repack-v2.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/json/sonarr/cf/repack-v2.json b/docs/json/sonarr/cf/repack-v2.json index 480463177..9da12c1bb 100644 --- a/docs/json/sonarr/cf/repack-v2.json +++ b/docs/json/sonarr/cf/repack-v2.json @@ -12,6 +12,15 @@ "fields": { "value": "\\b(repack2)\\b" } + }, + { + "name": "Proper v2", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(proper2)\\b" + } } ] } From 00f7e553636e3971bc356e9b1a861f07e029810d Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:32:30 +0000 Subject: [PATCH 3/9] Update score to consistent with Sonarr --- docs/json/radarr/cf/repack-proper.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/repack-proper.json b/docs/json/radarr/cf/repack-proper.json index 0dd24e2d8..09dc22f94 100644 --- a/docs/json/radarr/cf/repack-proper.json +++ b/docs/json/radarr/cf/repack-proper.json @@ -1,6 +1,6 @@ { "trash_id": "e7718d7a3ce595f289bfee26adc178f5", - "trash_score": "5", + "trash_score": "11", "trash_regex": "https://regex101.com/r/S91wR8/2", "name": "Repack/Proper", "includeCustomFormatWhenRenaming": false, From d0e273eb62e5948e5c370e0b303ba33b697c8ac2 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:33:06 +0000 Subject: [PATCH 4/9] Update score so consistent with Sonarr --- docs/json/radarr/cf/repack2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/repack2.json b/docs/json/radarr/cf/repack2.json index ea8ce03de..a1c62802c 100644 --- a/docs/json/radarr/cf/repack2.json +++ b/docs/json/radarr/cf/repack2.json @@ -1,6 +1,6 @@ { "trash_id": "ae43b294509409a6a13919dedd4764c4", - "trash_score": "6", + "trash_score": "12", "trash_regex": "https://regex101.com/r/kQ4oeP/1", "name": "Repack2", "includeCustomFormatWhenRenaming": false, From d9df06e76a88f5b3ed02380213f8891b0aa235c7 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:33:48 +0000 Subject: [PATCH 5/9] Update score so not trumped by repacks --- docs/json/radarr/cf/ma.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/ma.json b/docs/json/radarr/cf/ma.json index 24f7abed3..38fd52600 100644 --- a/docs/json/radarr/cf/ma.json +++ b/docs/json/radarr/cf/ma.json @@ -1,6 +1,6 @@ { "trash_id": "2a6039655313bf5dab1e43523b62c374", - "trash_score": "10", + "trash_score": "15", "name": "MA", "includeCustomFormatWhenRenaming": true, "specifications": [ From c2319cfa2a8bd0d675f08a865c1b2f5f8864ac5e Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:58:08 +0000 Subject: [PATCH 6/9] Add PQ to HDR formats --- docs/json/radarr/cf/2160p.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/2160p.json b/docs/json/radarr/cf/2160p.json index bbf8ecd68..bcec1dcad 100644 --- a/docs/json/radarr/cf/2160p.json +++ b/docs/json/radarr/cf/2160p.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b" } }, { From 3c8af842ab6543cb3588168f57b316dbe3418b46 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:58:42 +0000 Subject: [PATCH 7/9] Add PQ to HDR formats --- docs/json/radarr/cf/sdr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/sdr.json b/docs/json/radarr/cf/sdr.json index 82440f696..98a5a15b2 100644 --- a/docs/json/radarr/cf/sdr.json +++ b/docs/json/radarr/cf/sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": false, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b" } }, { From 4007ff9eb478edc45559fa11a23475d3b4c1451a Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:59:59 +0000 Subject: [PATCH 8/9] Add PQ to HDR formats --- docs/json/sonarr/cf/2160p.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/2160p.json b/docs/json/sonarr/cf/2160p.json index 82053f634..9829e2773 100644 --- a/docs/json/sonarr/cf/2160p.json +++ b/docs/json/sonarr/cf/2160p.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b" } }, { From 929ada68ce1352b2cfb2f0bcafbc57d2620ed4bb Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sat, 3 Dec 2022 17:00:30 +0000 Subject: [PATCH 9/9] Add PQ to SDR formats --- docs/json/sonarr/cf/sdr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/sdr.json b/docs/json/sonarr/cf/sdr.json index 8fbbb3321..d909086a7 100644 --- a/docs/json/sonarr/cf/sdr.json +++ b/docs/json/sonarr/cf/sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": false, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b" } }, {