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] 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" } } ]