From 9751b538c8c66344e2c3f6fd0de567d3fad7f71b Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:03 +0100 Subject: [PATCH 01/12] Revert "fix(starr): fix mistakes in HDR metadata CFs" This reverts commit fe08ba99059e98d7b77ce3f2bcee864e34a594ae. --- docs/json/radarr/cf/dv-fel.json | 2 +- docs/json/radarr/cf/dv.json | 4 ++-- docs/json/radarr/cf/hdr10.json | 4 ++-- docs/json/sonarr/cf/dv-fel.json | 2 +- docs/json/sonarr/cf/dv.json | 4 ++-- docs/json/sonarr/cf/hdr10.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index 928469fd1..ead2c1c98 100644 --- a/docs/json/radarr/cf/dv-fel.json +++ b/docs/json/radarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV|DoVi|Dolby[ .]?Vision)\\b" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index 24015e1cc..d33b8ed75 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -1,7 +1,7 @@ { "trash_id": "58d6a88f13e2db7f5059c41047876f00", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/w1PRcu/1", + "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10\\]?[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 10947520a..40a4a0e89 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "dfb86d5941bc9075d6af23b09c2aeecd", "trash_score": "500", - "trash_regex": "https://regex101.com/r/9144Ol/1", + "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10\\]?[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/dv-fel.json b/docs/json/sonarr/cf/dv-fel.json index f476b6f0d..338c2b095 100644 --- a/docs/json/sonarr/cf/dv-fel.json +++ b/docs/json/sonarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV|DoVi|Dolby[ .]?Vision)\\b" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 91a58d330..18ba9f196 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -1,7 +1,7 @@ { "trash_id": "6d0d8de7b57e35518ac0308b0ddf404e", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/w1PRcu/1", + "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10\\]?[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index 361ae05d8..1c79ed8e6 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "3497799d29a085e2ac2df9d468413c94", "trash_score": "500", - "trash_regex": "https://regex101.com/r/9144Ol/1", + "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10\\]?[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] From 88359394bb5c96270054e6932c542385b8b9bd77 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:11 +0100 Subject: [PATCH 02/12] Revert "feat(sonarr): updated missed CF" This reverts commit 6b9924849f5d679d9d3e2c315cd9c8e7437b85c0. --- docs/json/sonarr/cf/hdr-undefined.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/hdr-undefined.json b/docs/json/sonarr/cf/hdr-undefined.json index ac990960c..0f9853bdb 100644 --- a/docs/json/sonarr/cf/hdr-undefined.json +++ b/docs/json/sonarr/cf/hdr-undefined.json @@ -55,7 +55,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG(\\b|\\d))" + "value": "\\b(HLG)\\b" } }, { From b1a16cbcc99c016e162fbf2332d763f1bd10258e Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:15 +0100 Subject: [PATCH 03/12] Revert "feat(sonarr): reworked all HDR metadata CFs" This reverts commit 29c8d70ed9d638e8f5752671cd0b010772bbe8fd. --- docs/json/sonarr/cf/dv-fel.json | 2 +- docs/json/sonarr/cf/dv-hdr10.json | 22 ++++++++- docs/json/sonarr/cf/dv-hlg.json | 21 ++++++++- docs/json/sonarr/cf/dv-sdr.json | 21 ++++++++- docs/json/sonarr/cf/dv-webdl.json | 12 ++++- docs/json/sonarr/cf/dv.json | 30 +++++++++++- docs/json/sonarr/cf/hdr.json | 57 ++++++++++++++++++++++- docs/json/sonarr/cf/hdr10.json | 57 ++++++++++++++++++++++- docs/json/sonarr/cf/hdr10plus-boost.json | 58 +++++++++++++++++++++++- docs/json/sonarr/cf/hdr10plus.json | 58 +++++++++++++++++++++++- docs/json/sonarr/cf/hlg.json | 39 +++++++++++++++- docs/json/sonarr/cf/pq.json | 48 +++++++++++++++++++- docs/json/sonarr/cf/sdr.json | 4 +- 13 files changed, 404 insertions(+), 25 deletions(-) diff --git a/docs/json/sonarr/cf/dv-fel.json b/docs/json/sonarr/cf/dv-fel.json index 338c2b095..cd784d044 100644 --- a/docs/json/sonarr/cf/dv-fel.json +++ b/docs/json/sonarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 040bfe578..98fde3b11 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "7878c33f1963fefb3d6c8657d46c2f0a", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/xIFQQR/1", + "trash_regex": "https://regex101.com/r/pADWJD/8", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?)\\b)(?!.*\\b(HDR10(\\+|P(lus)?)))" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index 6fdfea0c7..c5cd3c981 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -1,7 +1,6 @@ { "trash_id": "1f733af03141f068a540eec352589a89", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/Bc7NTL/2", "name": "DV HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG(\\b|\\d)))" + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index c8429dd6a..044c8f34a 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -1,7 +1,6 @@ { "trash_id": "27954b0a80aab882522a88a4d9eae1cd", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/aJn0H8/1", "name": "DV SDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(SDR)\\b)" + "value": "\\b(DV[ .]SDR)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-webdl.json b/docs/json/sonarr/cf/dv-webdl.json index 6154d2126..08a2fcb53 100644 --- a/docs/json/sonarr/cf/dv-webdl.json +++ b/docs/json/sonarr/cf/dv-webdl.json @@ -1,7 +1,6 @@ { "trash_id": "9b27ab6498ec0f31a3353992e19434ca", "trash_score": "-10000", - "trash_regex": "https://regex101.com/r/Jqg9Jo/2", "name": "DV (WEBDL)", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { @@ -41,6 +40,15 @@ "value": "\\b(Flights)\\b" } }, + { + "name": "Not HDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR(\\b|\\d)" + } + }, { "name": "Not Hulu", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 18ba9f196..0a001449d 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -1,7 +1,6 @@ { "trash_id": "6d0d8de7b57e35518ac0308b0ddf404e", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,34 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/hdr.json b/docs/json/sonarr/cf/hdr.json index 96dafcf86..89a4482fc 100644 --- a/docs/json/sonarr/cf/hdr.json +++ b/docs/json/sonarr/cf/hdr.json @@ -1,7 +1,6 @@ { "trash_id": "3e2c4e748b64a1a1118e0ea3f4cf6875", "trash_score": "500", - "trash_regex": "https://regex101.com/r/Jy24ye/2", "name": "HDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } }, { diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index 1c79ed8e6..f88e070a7 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -1,7 +1,6 @@ { "trash_id": "3497799d29a085e2ac2df9d468413c94", "trash_score": "500", - "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/sonarr/cf/hdr10plus-boost.json b/docs/json/sonarr/cf/hdr10plus-boost.json index 87d7d494c..5f7f28815 100644 --- a/docs/json/sonarr/cf/hdr10plus-boost.json +++ b/docs/json/sonarr/cf/hdr10plus-boost.json @@ -1,7 +1,7 @@ { "trash_id": "0dad0a507451acddd754fe6dc3a7f5e7", "trash_score": "901", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+ Boost", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index 777d34a17..bf1c656ce 100644 --- a/docs/json/sonarr/cf/hdr10plus.json +++ b/docs/json/sonarr/cf/hdr10plus.json @@ -1,7 +1,7 @@ { "trash_id": "a3d82cbef5039f8d295478d28a887159", "trash_score": "600", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/sonarr/cf/hlg.json b/docs/json/sonarr/cf/hlg.json index 8229a9779..bf4476a14 100644 --- a/docs/json/sonarr/cf/hlg.json +++ b/docs/json/sonarr/cf/hlg.json @@ -1,7 +1,6 @@ { "trash_id": "17e889ce13117940092308f48b48b45b", "trash_score": "500", - "trash_regex": "https://regex101.com/r/gAoHQt/1", "name": "HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,43 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HLG(\\b|\\d)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" } } ] diff --git a/docs/json/sonarr/cf/pq.json b/docs/json/sonarr/cf/pq.json index 2445a2b61..137bea460 100644 --- a/docs/json/sonarr/cf/pq.json +++ b/docs/json/sonarr/cf/pq.json @@ -1,7 +1,6 @@ { "trash_id": "2a7e3be05d3861d6df7171ec74cad727", "trash_score": "500", - "trash_regex": "https://regex101.com/r/aaUkkW/2", "name": "PQ", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,52 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))" + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } } ] diff --git a/docs/json/sonarr/cf/sdr.json b/docs/json/sonarr/cf/sdr.json index 6c70d7255..8a4231bc5 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": "\\b(HDR(\\b|\\d))|\\b(DV|DoVi|Dolby[ .]?Vision)\\b|\\b(PQ)\\b|\\b(HLG(\\b|\\d))|\\b(FraMeSToR|HQMUX|SiCFoI)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SDR)\\b" + "value": "\\bSDR\\b" } } ] From 5cd2ba0948a785d9199b8d71bb1f5893056abdfe Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:17 +0100 Subject: [PATCH 04/12] Revert "feat(radarr): fixed mistakes & added regex examples" This reverts commit 3548bf0f5636c9735a6d91b593453f8c009272b5. --- docs/json/radarr/cf/dv-fel.json | 2 +- docs/json/radarr/cf/dv-hdr10.json | 2 +- docs/json/radarr/cf/dv-hlg.json | 3 +-- docs/json/radarr/cf/dv-sdr.json | 1 - docs/json/radarr/cf/dv-webdl.json | 3 +-- docs/json/radarr/cf/dv.json | 3 +-- docs/json/radarr/cf/hdr-undefined.json | 2 +- docs/json/radarr/cf/hdr.json | 3 +-- docs/json/radarr/cf/hdr10.json | 3 +-- docs/json/radarr/cf/hdr10plus-boost.json | 4 ++-- docs/json/radarr/cf/hdr10plus.json | 4 ++-- docs/json/radarr/cf/hlg.json | 3 +-- docs/json/radarr/cf/pq.json | 3 +-- 13 files changed, 14 insertions(+), 22 deletions(-) diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index ead2c1c98..175819ce8 100644 --- a/docs/json/radarr/cf/dv-fel.json +++ b/docs/json/radarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 986c54777..08be5bc72 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "e23edd2482476e595fb990b12e7c609c", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/xIFQQR/1", + "trash_regex": "https://regex101.com/r/pADWJD/8", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index 1c9cc3a9c..ea9cdbf01 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -1,7 +1,6 @@ { "trash_id": "55d53828b9d81cbe20b02efd00aa0efd", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/Bc7NTL/2", "name": "DV HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG(\\b|\\d)))" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG)\\b)" } } ] diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index e15647a7a..4c01b72f5 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -1,7 +1,6 @@ { "trash_id": "a3e19f8f627608af0211acd02bf89735", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/aJn0H8/1", "name": "DV SDR", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/docs/json/radarr/cf/dv-webdl.json b/docs/json/radarr/cf/dv-webdl.json index 96dd481d0..41b05a4ff 100644 --- a/docs/json/radarr/cf/dv-webdl.json +++ b/docs/json/radarr/cf/dv-webdl.json @@ -1,7 +1,6 @@ { "trash_id": "923b6abef9b17f937fab56cfcf89e1f1", "trash_score": "-10000", - "trash_regex": "https://regex101.com/r/Jqg9Jo/2", "name": "DV (WEBDL)", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index d33b8ed75..a354307dd 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -1,7 +1,6 @@ { "trash_id": "58d6a88f13e2db7f5059c41047876f00", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr-undefined.json b/docs/json/radarr/cf/hdr-undefined.json index e299628e2..f6146f1a4 100644 --- a/docs/json/radarr/cf/hdr-undefined.json +++ b/docs/json/radarr/cf/hdr-undefined.json @@ -55,7 +55,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG(\\b|\\d))" + "value": "\\b(HLG)\\b" } }, { diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index f6f21e12b..de8b90ac4 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -1,7 +1,6 @@ { "trash_id": "e61e28db95d22bedcadf030b8f156d96", "trash_score": "500", - "trash_regex": "https://regex101.com/r/Jy24ye/2", "name": "HDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 40a4a0e89..0c6344715 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -1,7 +1,6 @@ { "trash_id": "dfb86d5941bc9075d6af23b09c2aeecd", "trash_score": "500", - "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 8126bd959..44ce4ebdb 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -1,7 +1,7 @@ { "trash_id": "b17886cb4158d9fea189859409975758", "trash_score": "901", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+ Boost", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index 256f220e8..a8fada266 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -1,7 +1,7 @@ { "trash_id": "b974a6cd08c1066250f1f177d7aa1225", "trash_score": "600", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hlg.json b/docs/json/radarr/cf/hlg.json index 46b091d07..3081d33e1 100644 --- a/docs/json/radarr/cf/hlg.json +++ b/docs/json/radarr/cf/hlg.json @@ -1,7 +1,6 @@ { "trash_id": "9364dd386c9b4a1100dde8264690add7", "trash_score": "500", - "trash_regex": "https://regex101.com/r/gAoHQt/1", "name": "HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HLG(\\b|\\d)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HLG)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\b)" } } ] diff --git a/docs/json/radarr/cf/pq.json b/docs/json/radarr/cf/pq.json index f7f2290c6..be8de8880 100644 --- a/docs/json/radarr/cf/pq.json +++ b/docs/json/radarr/cf/pq.json @@ -1,7 +1,6 @@ { "trash_id": "08d6d8834ad9ec87b1dc7ec8148e7a1f", "trash_score": "500", - "trash_regex": "https://regex101.com/r/aaUkkW/2", "name": "PQ", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))" + "value": "(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\b)" } } ] From f33ba92be029379e8daabbddbe424ceb40a99875 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:20 +0100 Subject: [PATCH 05/12] Revert "feat(radarr): reworked all HDR metadata CFs" This reverts commit dcc1536c1e06ef2b27085b8dd1aebb82e9d6db81. --- docs/json/radarr/cf/dv-fel.json | 2 +- docs/json/radarr/cf/dv-hdr10.json | 20 ++++++++- docs/json/radarr/cf/dv-hlg.json | 20 ++++++++- docs/json/radarr/cf/dv-sdr.json | 20 ++++++++- docs/json/radarr/cf/dv-webdl.json | 11 ++++- docs/json/radarr/cf/dv.json | 29 +++++++++++- docs/json/radarr/cf/hdr.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hdr10.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hdr10plus-boost.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hdr10plus.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hlg.json | 38 +++++++++++++++- docs/json/radarr/cf/pq.json | 47 +++++++++++++++++++- docs/json/radarr/cf/sdr.json | 4 +- 13 files changed, 401 insertions(+), 14 deletions(-) diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index 175819ce8..90ded3961 100644 --- a/docs/json/radarr/cf/dv-fel.json +++ b/docs/json/radarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 08be5bc72..a30bf5c52 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -11,7 +11,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?)\\b)(?!.*\\b(HDR10(\\+|P(lus)?)))" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index ea9cdbf01..a8e66d394 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -10,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG)\\b)" + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index 4c01b72f5..a7c90faae 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -10,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(SDR)\\b)" + "value": "\\b(DV[ .]SDR)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-webdl.json b/docs/json/radarr/cf/dv-webdl.json index 41b05a4ff..be9e3ff42 100644 --- a/docs/json/radarr/cf/dv-webdl.json +++ b/docs/json/radarr/cf/dv-webdl.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { @@ -40,6 +40,15 @@ "value": "\\b(Flights)\\b" } }, + { + "name": "Not HDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR(\\b|\\d)" + } + }, { "name": "Not Hulu", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index a354307dd..d300cc56a 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -10,7 +10,34 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index de8b90ac4..935d5c27e 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -10,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 0c6344715..772059ffc 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -10,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 44ce4ebdb..847e936db 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index a8fada266..ecd8b8927 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/radarr/cf/hlg.json b/docs/json/radarr/cf/hlg.json index 3081d33e1..457db82f3 100644 --- a/docs/json/radarr/cf/hlg.json +++ b/docs/json/radarr/cf/hlg.json @@ -10,7 +10,43 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HLG)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\b)" + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" } } ] diff --git a/docs/json/radarr/cf/pq.json b/docs/json/radarr/cf/pq.json index be8de8880..d56ff9609 100644 --- a/docs/json/radarr/cf/pq.json +++ b/docs/json/radarr/cf/pq.json @@ -10,7 +10,52 @@ "negate": false, "required": true, "fields": { - "value": "(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\b)" + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } } ] diff --git a/docs/json/radarr/cf/sdr.json b/docs/json/radarr/cf/sdr.json index eb1bbcf03..aefccd030 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": "\\b(HDR(\\b|\\d))|\\b(DV|DoVi|Dolby[ .]?Vision)\\b|\\b(PQ)\\b|\\b(HLG(\\b|\\d))|\\b(FraMeSToR|HQMUX|SiCFoI)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SDR)\\b" + "value": "\\bSDR\\b" } } ] From bdf8bfcc6f280d00b2755f498cac509230240cd5 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 21:16:51 +0100 Subject: [PATCH 06/12] fix(starr): revert changes and fix HDR CFs --- docs/json/radarr/cf/dv-hdr10.json | 2 +- docs/json/radarr/cf/dv-hlg.json | 2 +- docs/json/radarr/cf/dv-sdr.json | 2 +- docs/json/radarr/cf/dv.json | 2 +- docs/json/radarr/cf/hdr.json | 22 ++-------------------- docs/json/radarr/cf/hdr10.json | 11 +---------- docs/json/radarr/cf/hdr10plus-boost.json | 11 +---------- docs/json/radarr/cf/hdr10plus.json | 11 +---------- docs/json/sonarr/cf/dv-hdr10.json | 2 +- docs/json/sonarr/cf/dv-hlg.json | 2 +- docs/json/sonarr/cf/dv-sdr.json | 2 +- docs/json/sonarr/cf/dv.json | 2 +- docs/json/sonarr/cf/hdr.json | 22 ++-------------------- docs/json/sonarr/cf/hdr10.json | 11 +---------- docs/json/sonarr/cf/hdr10plus-boost.json | 11 +---------- docs/json/sonarr/cf/hdr10plus.json | 11 +---------- 16 files changed, 18 insertions(+), 108 deletions(-) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index a30bf5c52..560acc5a8 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index a8e66d394..ddcb73a7a 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index a7c90faae..5f3988582 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index d300cc56a..b73842b4f 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index 935d5c27e..d1280f8e4 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bHDR(\\b|\\d)" + "value": "\\b(HDR)\\b" } }, { @@ -22,24 +22,6 @@ "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" - } - }, { "name": "Not PQ", "implementation": "ReleaseTitleSpecification", @@ -55,7 +37,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG)\\b" + "value": "\\bHLG(\\b|\\d)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 772059ffc..3c4da50be 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -19,16 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 847e936db..a03b7714b 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index ecd8b8927..06ecce55e 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 98fde3b11..be16533f3 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index c5cd3c981..e933fd771 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index 044c8f34a..33b8f8de9 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 0a001449d..5d13d5650 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr.json b/docs/json/sonarr/cf/hdr.json index 89a4482fc..62ae62ea7 100644 --- a/docs/json/sonarr/cf/hdr.json +++ b/docs/json/sonarr/cf/hdr.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bHDR(\\b|\\d)" + "value": "\\b(HDR)\\b" } }, { @@ -22,24 +22,6 @@ "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" - } - }, { "name": "Not PQ", "implementation": "ReleaseTitleSpecification", @@ -55,7 +37,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG)\\b" + "value": "\\bHLG(\\b|\\d)" } }, { diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index f88e070a7..16ea669fa 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -19,16 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus-boost.json b/docs/json/sonarr/cf/hdr10plus-boost.json index 5f7f28815..47ab2a8a0 100644 --- a/docs/json/sonarr/cf/hdr10plus-boost.json +++ b/docs/json/sonarr/cf/hdr10plus-boost.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index bf1c656ce..b1d0defef 100644 --- a/docs/json/sonarr/cf/hdr10plus.json +++ b/docs/json/sonarr/cf/hdr10plus.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { From 35e4d4ed3587cc7f86f5aa132a5863492d6411a7 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:03 +0100 Subject: [PATCH 07/12] Revert "fix(starr): fix mistakes in HDR metadata CFs" This reverts commit fe08ba99059e98d7b77ce3f2bcee864e34a594ae. --- docs/json/radarr/cf/dv-fel.json | 2 +- docs/json/radarr/cf/dv.json | 4 ++-- docs/json/radarr/cf/hdr10.json | 4 ++-- docs/json/sonarr/cf/dv-fel.json | 2 +- docs/json/sonarr/cf/dv.json | 4 ++-- docs/json/sonarr/cf/hdr10.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index 928469fd1..ead2c1c98 100644 --- a/docs/json/radarr/cf/dv-fel.json +++ b/docs/json/radarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV|DoVi|Dolby[ .]?Vision)\\b" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index 24015e1cc..d33b8ed75 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -1,7 +1,7 @@ { "trash_id": "58d6a88f13e2db7f5059c41047876f00", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/w1PRcu/1", + "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10\\]?[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 10947520a..40a4a0e89 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "dfb86d5941bc9075d6af23b09c2aeecd", "trash_score": "500", - "trash_regex": "https://regex101.com/r/9144Ol/1", + "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10\\]?[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/dv-fel.json b/docs/json/sonarr/cf/dv-fel.json index f476b6f0d..338c2b095 100644 --- a/docs/json/sonarr/cf/dv-fel.json +++ b/docs/json/sonarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV|DoVi|Dolby[ .]?Vision)\\b" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 91a58d330..18ba9f196 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -1,7 +1,7 @@ { "trash_id": "6d0d8de7b57e35518ac0308b0ddf404e", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/w1PRcu/1", + "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10\\]?[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index 361ae05d8..1c79ed8e6 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "3497799d29a085e2ac2df9d468413c94", "trash_score": "500", - "trash_regex": "https://regex101.com/r/9144Ol/1", + "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10\\]?[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] From fb74f6be6a940e7401382b2659ea36ce805cbe5b Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:11 +0100 Subject: [PATCH 08/12] Revert "feat(sonarr): updated missed CF" This reverts commit 6b9924849f5d679d9d3e2c315cd9c8e7437b85c0. --- docs/json/sonarr/cf/hdr-undefined.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/hdr-undefined.json b/docs/json/sonarr/cf/hdr-undefined.json index ac990960c..0f9853bdb 100644 --- a/docs/json/sonarr/cf/hdr-undefined.json +++ b/docs/json/sonarr/cf/hdr-undefined.json @@ -55,7 +55,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG(\\b|\\d))" + "value": "\\b(HLG)\\b" } }, { From 5ac76d271c2119b1c1c0b689b33809517960f44e Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:15 +0100 Subject: [PATCH 09/12] Revert "feat(sonarr): reworked all HDR metadata CFs" This reverts commit 29c8d70ed9d638e8f5752671cd0b010772bbe8fd. --- docs/json/sonarr/cf/dv-fel.json | 2 +- docs/json/sonarr/cf/dv-hdr10.json | 22 ++++++++- docs/json/sonarr/cf/dv-hlg.json | 21 ++++++++- docs/json/sonarr/cf/dv-sdr.json | 21 ++++++++- docs/json/sonarr/cf/dv-webdl.json | 12 ++++- docs/json/sonarr/cf/dv.json | 30 +++++++++++- docs/json/sonarr/cf/hdr.json | 57 ++++++++++++++++++++++- docs/json/sonarr/cf/hdr10.json | 57 ++++++++++++++++++++++- docs/json/sonarr/cf/hdr10plus-boost.json | 58 +++++++++++++++++++++++- docs/json/sonarr/cf/hdr10plus.json | 58 +++++++++++++++++++++++- docs/json/sonarr/cf/hlg.json | 39 +++++++++++++++- docs/json/sonarr/cf/pq.json | 48 +++++++++++++++++++- docs/json/sonarr/cf/sdr.json | 4 +- 13 files changed, 404 insertions(+), 25 deletions(-) diff --git a/docs/json/sonarr/cf/dv-fel.json b/docs/json/sonarr/cf/dv-fel.json index 338c2b095..cd784d044 100644 --- a/docs/json/sonarr/cf/dv-fel.json +++ b/docs/json/sonarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 040bfe578..98fde3b11 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "7878c33f1963fefb3d6c8657d46c2f0a", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/xIFQQR/1", + "trash_regex": "https://regex101.com/r/pADWJD/8", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?)\\b)(?!.*\\b(HDR10(\\+|P(lus)?)))" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index 6fdfea0c7..c5cd3c981 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -1,7 +1,6 @@ { "trash_id": "1f733af03141f068a540eec352589a89", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/Bc7NTL/2", "name": "DV HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG(\\b|\\d)))" + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index c8429dd6a..044c8f34a 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -1,7 +1,6 @@ { "trash_id": "27954b0a80aab882522a88a4d9eae1cd", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/aJn0H8/1", "name": "DV SDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(SDR)\\b)" + "value": "\\b(DV[ .]SDR)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-webdl.json b/docs/json/sonarr/cf/dv-webdl.json index 6154d2126..08a2fcb53 100644 --- a/docs/json/sonarr/cf/dv-webdl.json +++ b/docs/json/sonarr/cf/dv-webdl.json @@ -1,7 +1,6 @@ { "trash_id": "9b27ab6498ec0f31a3353992e19434ca", "trash_score": "-10000", - "trash_regex": "https://regex101.com/r/Jqg9Jo/2", "name": "DV (WEBDL)", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { @@ -41,6 +40,15 @@ "value": "\\b(Flights)\\b" } }, + { + "name": "Not HDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR(\\b|\\d)" + } + }, { "name": "Not Hulu", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 18ba9f196..0a001449d 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -1,7 +1,6 @@ { "trash_id": "6d0d8de7b57e35518ac0308b0ddf404e", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,34 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/hdr.json b/docs/json/sonarr/cf/hdr.json index 96dafcf86..89a4482fc 100644 --- a/docs/json/sonarr/cf/hdr.json +++ b/docs/json/sonarr/cf/hdr.json @@ -1,7 +1,6 @@ { "trash_id": "3e2c4e748b64a1a1118e0ea3f4cf6875", "trash_score": "500", - "trash_regex": "https://regex101.com/r/Jy24ye/2", "name": "HDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } }, { diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index 1c79ed8e6..f88e070a7 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -1,7 +1,6 @@ { "trash_id": "3497799d29a085e2ac2df9d468413c94", "trash_score": "500", - "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/sonarr/cf/hdr10plus-boost.json b/docs/json/sonarr/cf/hdr10plus-boost.json index 87d7d494c..5f7f28815 100644 --- a/docs/json/sonarr/cf/hdr10plus-boost.json +++ b/docs/json/sonarr/cf/hdr10plus-boost.json @@ -1,7 +1,7 @@ { "trash_id": "0dad0a507451acddd754fe6dc3a7f5e7", "trash_score": "901", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+ Boost", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index 777d34a17..bf1c656ce 100644 --- a/docs/json/sonarr/cf/hdr10plus.json +++ b/docs/json/sonarr/cf/hdr10plus.json @@ -1,7 +1,7 @@ { "trash_id": "a3d82cbef5039f8d295478d28a887159", "trash_score": "600", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/sonarr/cf/hlg.json b/docs/json/sonarr/cf/hlg.json index 8229a9779..bf4476a14 100644 --- a/docs/json/sonarr/cf/hlg.json +++ b/docs/json/sonarr/cf/hlg.json @@ -1,7 +1,6 @@ { "trash_id": "17e889ce13117940092308f48b48b45b", "trash_score": "500", - "trash_regex": "https://regex101.com/r/gAoHQt/1", "name": "HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,43 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HLG(\\b|\\d)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" } } ] diff --git a/docs/json/sonarr/cf/pq.json b/docs/json/sonarr/cf/pq.json index 2445a2b61..137bea460 100644 --- a/docs/json/sonarr/cf/pq.json +++ b/docs/json/sonarr/cf/pq.json @@ -1,7 +1,6 @@ { "trash_id": "2a7e3be05d3861d6df7171ec74cad727", "trash_score": "500", - "trash_regex": "https://regex101.com/r/aaUkkW/2", "name": "PQ", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,52 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))" + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } } ] diff --git a/docs/json/sonarr/cf/sdr.json b/docs/json/sonarr/cf/sdr.json index 6c70d7255..8a4231bc5 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": "\\b(HDR(\\b|\\d))|\\b(DV|DoVi|Dolby[ .]?Vision)\\b|\\b(PQ)\\b|\\b(HLG(\\b|\\d))|\\b(FraMeSToR|HQMUX|SiCFoI)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SDR)\\b" + "value": "\\bSDR\\b" } } ] From 49cd882f3634e3e689fe26873d26195812b9a060 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:17 +0100 Subject: [PATCH 10/12] Revert "feat(radarr): fixed mistakes & added regex examples" This reverts commit 3548bf0f5636c9735a6d91b593453f8c009272b5. --- docs/json/radarr/cf/dv-fel.json | 2 +- docs/json/radarr/cf/dv-hdr10.json | 2 +- docs/json/radarr/cf/dv-hlg.json | 3 +-- docs/json/radarr/cf/dv-sdr.json | 1 - docs/json/radarr/cf/dv-webdl.json | 3 +-- docs/json/radarr/cf/dv.json | 3 +-- docs/json/radarr/cf/hdr-undefined.json | 2 +- docs/json/radarr/cf/hdr.json | 3 +-- docs/json/radarr/cf/hdr10.json | 3 +-- docs/json/radarr/cf/hdr10plus-boost.json | 4 ++-- docs/json/radarr/cf/hdr10plus.json | 4 ++-- docs/json/radarr/cf/hlg.json | 3 +-- docs/json/radarr/cf/pq.json | 3 +-- 13 files changed, 14 insertions(+), 22 deletions(-) diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index ead2c1c98..175819ce8 100644 --- a/docs/json/radarr/cf/dv-fel.json +++ b/docs/json/radarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 986c54777..08be5bc72 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -1,7 +1,7 @@ { "trash_id": "e23edd2482476e595fb990b12e7c609c", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/xIFQQR/1", + "trash_regex": "https://regex101.com/r/pADWJD/8", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index 1c9cc3a9c..ea9cdbf01 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -1,7 +1,6 @@ { "trash_id": "55d53828b9d81cbe20b02efd00aa0efd", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/Bc7NTL/2", "name": "DV HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG(\\b|\\d)))" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG)\\b)" } } ] diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index e15647a7a..4c01b72f5 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -1,7 +1,6 @@ { "trash_id": "a3e19f8f627608af0211acd02bf89735", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/aJn0H8/1", "name": "DV SDR", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/docs/json/radarr/cf/dv-webdl.json b/docs/json/radarr/cf/dv-webdl.json index 96dd481d0..41b05a4ff 100644 --- a/docs/json/radarr/cf/dv-webdl.json +++ b/docs/json/radarr/cf/dv-webdl.json @@ -1,7 +1,6 @@ { "trash_id": "923b6abef9b17f937fab56cfcf89e1f1", "trash_score": "-10000", - "trash_regex": "https://regex101.com/r/Jqg9Jo/2", "name": "DV (WEBDL)", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index d33b8ed75..a354307dd 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -1,7 +1,6 @@ { "trash_id": "58d6a88f13e2db7f5059c41047876f00", "trash_score": "1500", - "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr-undefined.json b/docs/json/radarr/cf/hdr-undefined.json index e299628e2..f6146f1a4 100644 --- a/docs/json/radarr/cf/hdr-undefined.json +++ b/docs/json/radarr/cf/hdr-undefined.json @@ -55,7 +55,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG(\\b|\\d))" + "value": "\\b(HLG)\\b" } }, { diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index f6f21e12b..de8b90ac4 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -1,7 +1,6 @@ { "trash_id": "e61e28db95d22bedcadf030b8f156d96", "trash_score": "500", - "trash_regex": "https://regex101.com/r/Jy24ye/2", "name": "HDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 40a4a0e89..0c6344715 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -1,7 +1,6 @@ { "trash_id": "dfb86d5941bc9075d6af23b09c2aeecd", "trash_score": "500", - "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 8126bd959..44ce4ebdb 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -1,7 +1,7 @@ { "trash_id": "b17886cb4158d9fea189859409975758", "trash_score": "901", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+ Boost", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index 256f220e8..a8fada266 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -1,7 +1,7 @@ { "trash_id": "b974a6cd08c1066250f1f177d7aa1225", "trash_score": "600", - "trash_regex": "https://regex101.com/r/keKCbP/2", + "trash_regex": "https://regex101.com/r/hCAQEO/4", "name": "HDR10+", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hlg.json b/docs/json/radarr/cf/hlg.json index 46b091d07..3081d33e1 100644 --- a/docs/json/radarr/cf/hlg.json +++ b/docs/json/radarr/cf/hlg.json @@ -1,7 +1,6 @@ { "trash_id": "9364dd386c9b4a1100dde8264690add7", "trash_score": "500", - "trash_regex": "https://regex101.com/r/gAoHQt/1", "name": "HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HLG(\\b|\\d)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\\b)" + "value": "^(?=.*\\b(HLG)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\b)" } } ] diff --git a/docs/json/radarr/cf/pq.json b/docs/json/radarr/cf/pq.json index f7f2290c6..be8de8880 100644 --- a/docs/json/radarr/cf/pq.json +++ b/docs/json/radarr/cf/pq.json @@ -1,7 +1,6 @@ { "trash_id": "08d6d8834ad9ec87b1dc7ec8148e7a1f", "trash_score": "500", - "trash_regex": "https://regex101.com/r/aaUkkW/2", "name": "PQ", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))" + "value": "(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\b)" } } ] From 5e3cd632aac1cf6edf9a22e383748e270883229b Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:54:20 +0100 Subject: [PATCH 11/12] Revert "feat(radarr): reworked all HDR metadata CFs" This reverts commit dcc1536c1e06ef2b27085b8dd1aebb82e9d6db81. --- docs/json/radarr/cf/dv-fel.json | 2 +- docs/json/radarr/cf/dv-hdr10.json | 20 ++++++++- docs/json/radarr/cf/dv-hlg.json | 20 ++++++++- docs/json/radarr/cf/dv-sdr.json | 20 ++++++++- docs/json/radarr/cf/dv-webdl.json | 11 ++++- docs/json/radarr/cf/dv.json | 29 +++++++++++- docs/json/radarr/cf/hdr.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hdr10.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hdr10plus-boost.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hdr10plus.json | 56 +++++++++++++++++++++++- docs/json/radarr/cf/hlg.json | 38 +++++++++++++++- docs/json/radarr/cf/pq.json | 47 +++++++++++++++++++- docs/json/radarr/cf/sdr.json | 4 +- 13 files changed, 401 insertions(+), 14 deletions(-) diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index 175819ce8..90ded3961 100644 --- a/docs/json/radarr/cf/dv-fel.json +++ b/docs/json/radarr/cf/dv-fel.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 08be5bc72..a30bf5c52 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -11,7 +11,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?)\\b)(?!.*\\b(HDR10(\\+|P(lus)?)))" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index ea9cdbf01..a8e66d394 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -10,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG)\\b)" + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index 4c01b72f5..a7c90faae 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -10,7 +10,25 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(SDR)\\b)" + "value": "\\b(DV[ .]SDR)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-webdl.json b/docs/json/radarr/cf/dv-webdl.json index 41b05a4ff..be9e3ff42 100644 --- a/docs/json/radarr/cf/dv-webdl.json +++ b/docs/json/radarr/cf/dv-webdl.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, { @@ -40,6 +40,15 @@ "value": "\\b(Flights)\\b" } }, + { + "name": "Not HDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR(\\b|\\d)" + } + }, { "name": "Not Hulu", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index a354307dd..d300cc56a 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -10,7 +10,34 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(10[^+P])?)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not DV HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]HLG)\\b" + } + }, + { + "name": "Not DV SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index de8b90ac4..935d5c27e 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -10,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 0c6344715..772059ffc 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -10,7 +10,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10[^+P])\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 44ce4ebdb..847e936db 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index a8fada266..ecd8b8927 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -11,7 +11,61 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\\b)(?!.*\\b(PQ)\\b)" + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not DV HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } } ] diff --git a/docs/json/radarr/cf/hlg.json b/docs/json/radarr/cf/hlg.json index 3081d33e1..457db82f3 100644 --- a/docs/json/radarr/cf/hlg.json +++ b/docs/json/radarr/cf/hlg.json @@ -10,7 +10,43 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HLG)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\b)" + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not PQ", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(PQ)\\b" } } ] diff --git a/docs/json/radarr/cf/pq.json b/docs/json/radarr/cf/pq.json index be8de8880..d56ff9609 100644 --- a/docs/json/radarr/cf/pq.json +++ b/docs/json/radarr/cf/pq.json @@ -10,7 +10,52 @@ "negate": false, "required": true, "fields": { - "value": "(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG)\b)" + "value": "\\b(PQ)\\b" + } + }, + { + "name": "Not DV", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" + } + }, + { + "name": "Not HDR10+", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\+|P(lus)?\\b)" + } + }, + { + "name": "Not HDR10", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bHDR10(\\b[^+|Plus])" + } + }, + { + "name": "Not HLG", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(HLG)\\b" + } + }, + { + "name": "Not SDR", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\bSDR(\\b|\\d)" } } ] diff --git a/docs/json/radarr/cf/sdr.json b/docs/json/radarr/cf/sdr.json index eb1bbcf03..aefccd030 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": "\\b(HDR(\\b|\\d))|\\b(DV|DoVi|Dolby[ .]?Vision)\\b|\\b(PQ)\\b|\\b(HLG(\\b|\\d))|\\b(FraMeSToR|HQMUX|SiCFoI)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SDR)\\b" + "value": "\\bSDR\\b" } } ] From 24bfbe838a0086b3e5e56a450a59280f9f28598f Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sun, 19 Feb 2023 21:16:51 +0100 Subject: [PATCH 12/12] fix(starr): revert changes and fix HDR CFs --- docs/json/radarr/cf/dv-hdr10.json | 2 +- docs/json/radarr/cf/dv-hlg.json | 2 +- docs/json/radarr/cf/dv-sdr.json | 2 +- docs/json/radarr/cf/dv.json | 2 +- docs/json/radarr/cf/hdr.json | 22 ++-------------------- docs/json/radarr/cf/hdr10.json | 11 +---------- docs/json/radarr/cf/hdr10plus-boost.json | 11 +---------- docs/json/radarr/cf/hdr10plus.json | 11 +---------- docs/json/sonarr/cf/dv-hdr10.json | 2 +- docs/json/sonarr/cf/dv-hlg.json | 2 +- docs/json/sonarr/cf/dv-sdr.json | 2 +- docs/json/sonarr/cf/dv.json | 2 +- docs/json/sonarr/cf/hdr.json | 22 ++-------------------- docs/json/sonarr/cf/hdr10.json | 11 +---------- docs/json/sonarr/cf/hdr10plus-boost.json | 11 +---------- docs/json/sonarr/cf/hdr10plus.json | 11 +---------- 16 files changed, 18 insertions(+), 108 deletions(-) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index a30bf5c52..560acc5a8 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index a8e66d394..ddcb73a7a 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index a7c90faae..5f3988582 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index d300cc56a..b73842b4f 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index 935d5c27e..d1280f8e4 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bHDR(\\b|\\d)" + "value": "\\b(HDR)\\b" } }, { @@ -22,24 +22,6 @@ "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" - } - }, { "name": "Not PQ", "implementation": "ReleaseTitleSpecification", @@ -55,7 +37,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG)\\b" + "value": "\\bHLG(\\b|\\d)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 772059ffc..3c4da50be 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -19,16 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 847e936db..a03b7714b 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index ecd8b8927..06ecce55e 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 98fde3b11..be16533f3 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index c5cd3c981..e933fd771 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index 044c8f34a..33b8f8de9 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 0a001449d..5d13d5650 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr.json b/docs/json/sonarr/cf/hdr.json index 89a4482fc..62ae62ea7 100644 --- a/docs/json/sonarr/cf/hdr.json +++ b/docs/json/sonarr/cf/hdr.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bHDR(\\b|\\d)" + "value": "\\b(HDR)\\b" } }, { @@ -22,24 +22,6 @@ "value": "\\b(dv|dovi|dolby[ .]?vision)\\b" } }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" - } - }, { "name": "Not PQ", "implementation": "ReleaseTitleSpecification", @@ -55,7 +37,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(HLG)\\b" + "value": "\\bHLG(\\b|\\d)" } }, { diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index f88e070a7..16ea669fa 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -19,16 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10+", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\+|P(lus)?\\b)" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus-boost.json b/docs/json/sonarr/cf/hdr10plus-boost.json index 5f7f28815..47ab2a8a0 100644 --- a/docs/json/sonarr/cf/hdr10plus-boost.json +++ b/docs/json/sonarr/cf/hdr10plus-boost.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index bf1c656ce..b1d0defef 100644 --- a/docs/json/sonarr/cf/hdr10plus.json +++ b/docs/json/sonarr/cf/hdr10plus.json @@ -20,16 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" - } - }, - { - "name": "Not HDR10", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bHDR10(\\b[^+|Plus])" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?(?!\\+))\\b)" } }, {