diff --git a/docs/json/radarr/cf/dv-fel.json b/docs/json/radarr/cf/dv-fel.json index 90ded3961..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-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index a30bf5c52..986c54777 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/pADWJD/8", + "trash_regex": "https://regex101.com/r/xIFQQR/1", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,25 +11,7 @@ "negate": false, "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" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?)\\b)(?!.*\\b(HDR10(\\+|P(lus)?)))" } } ] diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index a8e66d394..1c9cc3a9c 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -1,6 +1,7 @@ { "trash_id": "55d53828b9d81cbe20b02efd00aa0efd", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/Bc7NTL/2", "name": "DV HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,25 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG(\\b|\\d)))" } } ] diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index a7c90faae..e15647a7a 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -1,6 +1,7 @@ { "trash_id": "a3e19f8f627608af0211acd02bf89735", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/aJn0H8/1", "name": "DV SDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,25 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(SDR)\\b)" } } ] diff --git a/docs/json/radarr/cf/dv-webdl.json b/docs/json/radarr/cf/dv-webdl.json index be9e3ff42..96dd481d0 100644 --- a/docs/json/radarr/cf/dv-webdl.json +++ b/docs/json/radarr/cf/dv-webdl.json @@ -1,6 +1,7 @@ { "trash_id": "923b6abef9b17f937fab56cfcf89e1f1", "trash_score": "-10000", + "trash_regex": "https://regex101.com/r/Jqg9Jo/2", "name": "DV (WEBDL)", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,7 +11,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)" } }, { @@ -40,15 +41,6 @@ "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 d300cc56a..d33b8ed75 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -1,6 +1,7 @@ { "trash_id": "58d6a88f13e2db7f5059c41047876f00", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,34 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "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/hdr-undefined.json b/docs/json/radarr/cf/hdr-undefined.json index f6146f1a4..e299628e2 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" + "value": "\\b(HLG(\\b|\\d))" } }, { diff --git a/docs/json/radarr/cf/hdr.json b/docs/json/radarr/cf/hdr.json index 935d5c27e..f6f21e12b 100644 --- a/docs/json/radarr/cf/hdr.json +++ b/docs/json/radarr/cf/hdr.json @@ -1,6 +1,7 @@ { "trash_id": "e61e28db95d22bedcadf030b8f156d96", "trash_score": "500", + "trash_regex": "https://regex101.com/r/Jy24ye/2", "name": "HDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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)" + "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\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 772059ffc..40a4a0e89 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -1,6 +1,7 @@ { "trash_id": "dfb86d5941bc9075d6af23b09c2aeecd", "trash_score": "500", + "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "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/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 847e936db..8126bd959 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/hCAQEO/4", + "trash_regex": "https://regex101.com/r/keKCbP/2", "name": "HDR10+ Boost", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index ecd8b8927..256f220e8 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/hCAQEO/4", + "trash_regex": "https://regex101.com/r/keKCbP/2", "name": "HDR10+", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/radarr/cf/hlg.json b/docs/json/radarr/cf/hlg.json index 457db82f3..46b091d07 100644 --- a/docs/json/radarr/cf/hlg.json +++ b/docs/json/radarr/cf/hlg.json @@ -1,6 +1,7 @@ { "trash_id": "9364dd386c9b4a1100dde8264690add7", "trash_score": "500", + "trash_regex": "https://regex101.com/r/gAoHQt/1", "name": "HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,43 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(HLG(\\b|\\d)))(?!.*\\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 d56ff9609..f7f2290c6 100644 --- a/docs/json/radarr/cf/pq.json +++ b/docs/json/radarr/cf/pq.json @@ -1,6 +1,7 @@ { "trash_id": "08d6d8834ad9ec87b1dc7ec8148e7a1f", "trash_score": "500", + "trash_regex": "https://regex101.com/r/aaUkkW/2", "name": "PQ", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,52 +11,7 @@ "negate": false, "required": true, "fields": { - "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)" + "value": "^(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))" } } ] diff --git a/docs/json/radarr/cf/sdr.json b/docs/json/radarr/cf/sdr.json index aefccd030..eb1bbcf03 100644 --- a/docs/json/radarr/cf/sdr.json +++ b/docs/json/radarr/cf/sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": false, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" + "value": "\\b(HDR(\\b|\\d))|\\b(DV|DoVi|Dolby[ .]?Vision)\\b|\\b(PQ)\\b|\\b(HLG(\\b|\\d))|\\b(FraMeSToR|HQMUX|SiCFoI)\\b" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bSDR\\b" + "value": "\\b(SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-fel.json b/docs/json/sonarr/cf/dv-fel.json index cd784d044..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-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 98fde3b11..040bfe578 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/pADWJD/8", + "trash_regex": "https://regex101.com/r/xIFQQR/1", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,25 +11,7 @@ "negate": false, "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" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HDR(10)?)\\b)(?!.*\\b(HDR10(\\+|P(lus)?)))" } } ] diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index c5cd3c981..6fdfea0c7 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -1,6 +1,7 @@ { "trash_id": "1f733af03141f068a540eec352589a89", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/Bc7NTL/2", "name": "DV HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,25 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(HLG(\\b|\\d)))" } } ] diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index 044c8f34a..c8429dd6a 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -1,6 +1,7 @@ { "trash_id": "27954b0a80aab882522a88a4d9eae1cd", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/aJn0H8/1", "name": "DV SDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,25 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?=.*\\b(SDR)\\b)" } } ] diff --git a/docs/json/sonarr/cf/dv-webdl.json b/docs/json/sonarr/cf/dv-webdl.json index 08a2fcb53..6154d2126 100644 --- a/docs/json/sonarr/cf/dv-webdl.json +++ b/docs/json/sonarr/cf/dv-webdl.json @@ -1,6 +1,7 @@ { "trash_id": "9b27ab6498ec0f31a3353992e19434ca", "trash_score": "-10000", + "trash_regex": "https://regex101.com/r/Jqg9Jo/2", "name": "DV (WEBDL)", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,7 +11,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)" } }, { @@ -40,15 +41,6 @@ "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 0a001449d..18ba9f196 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -1,6 +1,7 @@ { "trash_id": "6d0d8de7b57e35518ac0308b0ddf404e", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/h9VdrP/2", "name": "DV", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,34 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "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/hdr-undefined.json b/docs/json/sonarr/cf/hdr-undefined.json index 0f9853bdb..ac990960c 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" + "value": "\\b(HLG(\\b|\\d))" } }, { diff --git a/docs/json/sonarr/cf/hdr.json b/docs/json/sonarr/cf/hdr.json index 89a4482fc..96dafcf86 100644 --- a/docs/json/sonarr/cf/hdr.json +++ b/docs/json/sonarr/cf/hdr.json @@ -1,6 +1,7 @@ { "trash_id": "3e2c4e748b64a1a1118e0ea3f4cf6875", "trash_score": "500", + "trash_regex": "https://regex101.com/r/Jy24ye/2", "name": "HDR", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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)" + "value": "^(?=.*\\b(HDR)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\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 f88e070a7..1c79ed8e6 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -1,6 +1,7 @@ { "trash_id": "3497799d29a085e2ac2df9d468413c94", "trash_score": "500", + "trash_regex": "https://regex101.com/r/EsT3YN/2", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "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/hdr10plus-boost.json b/docs/json/sonarr/cf/hdr10plus-boost.json index 5f7f28815..87d7d494c 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/hCAQEO/4", + "trash_regex": "https://regex101.com/r/keKCbP/2", "name": "HDR10+ Boost", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index bf1c656ce..777d34a17 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/hCAQEO/4", + "trash_regex": "https://regex101.com/r/keKCbP/2", "name": "HDR10+", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,61 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(HDR10(\\+|P(lus)?)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/hlg.json b/docs/json/sonarr/cf/hlg.json index bf4476a14..8229a9779 100644 --- a/docs/json/sonarr/cf/hlg.json +++ b/docs/json/sonarr/cf/hlg.json @@ -1,6 +1,7 @@ { "trash_id": "17e889ce13117940092308f48b48b45b", "trash_score": "500", + "trash_regex": "https://regex101.com/r/gAoHQt/1", "name": "HLG", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,43 +11,7 @@ "negate": false, "required": true, "fields": { - "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" + "value": "^(?=.*\\b(HLG(\\b|\\d)))(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(PQ)\\b)" } } ] diff --git a/docs/json/sonarr/cf/pq.json b/docs/json/sonarr/cf/pq.json index 137bea460..2445a2b61 100644 --- a/docs/json/sonarr/cf/pq.json +++ b/docs/json/sonarr/cf/pq.json @@ -1,6 +1,7 @@ { "trash_id": "2a7e3be05d3861d6df7171ec74cad727", "trash_score": "500", + "trash_regex": "https://regex101.com/r/aaUkkW/2", "name": "PQ", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -10,52 +11,7 @@ "negate": false, "required": true, "fields": { - "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)" + "value": "^(?=.*\\b(PQ)\\b)(?!.*\\b(DV|DoVi|Dolby[ .]?Vision)\\b)(?!.*\\b(HDR(\\b|\\d)))(?!.*\\b(SDR)\\b)(?!.*\\b(HLG(\\b|\\d)))" } } ] diff --git a/docs/json/sonarr/cf/sdr.json b/docs/json/sonarr/cf/sdr.json index 8a4231bc5..6c70d7255 100644 --- a/docs/json/sonarr/cf/sdr.json +++ b/docs/json/sonarr/cf/sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": false, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" + "value": "\\b(HDR(\\b|\\d))|\\b(DV|DoVi|Dolby[ .]?Vision)\\b|\\b(PQ)\\b|\\b(HLG(\\b|\\d))|\\b(FraMeSToR|HQMUX|SiCFoI)\\b" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bSDR\\b" + "value": "\\b(SDR)\\b" } } ] diff --git a/docs/updates.txt b/docs/updates.txt index f4759ade0..ec727fb20 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,13 @@ +# 2023-02-18 21:45 +**[New]** +- [Radarr] New CF `Upscaled` - A custom format that matches the most commonly used terms in upscaled releases. + +**[Updated]** +- [Starr] Rewrote almost all the regex for the HDR metadata CFs to be oneliners, to prevent false matches from happening. + +**[Fixed]** +- None + # 2023-02-17 22:40 **[New]** - None