From 2a64aa840e8b71898d1a01311b7aec46b563e1ac Mon Sep 17 00:00:00 2001 From: garypiner Date: Thu, 5 Jan 2023 14:34:37 +0000 Subject: [PATCH 1/3] exclude hdr10plus from DVHDR10 --- 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/hdr10.json | 2 +- docs/json/radarr/cf/hdr10plus-boost.json | 2 +- docs/json/radarr/cf/hdr10plus.json | 2 +- 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/hdr10.json | 2 +- docs/json/sonarr/cf/hdr10plus-boost.json | 2 +- docs/json/sonarr/cf/hdr10plus.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index db39dc94d..831f76f7c 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index 8c125f5e5..a8e66d394 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index 0ddcbff83..a7c90faae 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index e40114b78..d300cc56a 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index 6ef09a484..772059ffc 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus-boost.json b/docs/json/radarr/cf/hdr10plus-boost.json index 25e4b51e5..847e936db 100644 --- a/docs/json/radarr/cf/hdr10plus-boost.json +++ b/docs/json/radarr/cf/hdr10plus-boost.json @@ -20,7 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index 22a43878e..ecd8b8927 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -20,7 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 4878b2242..3df94b899 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index 9502f5024..c5cd3c981 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index 52e766b6e..044c8f34a 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 4571f3a94..0a001449d 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(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index 40b08706e..f88e070a7 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus-boost.json b/docs/json/sonarr/cf/hdr10plus-boost.json index a9856375f..5f7f28815 100644 --- a/docs/json/sonarr/cf/hdr10plus-boost.json +++ b/docs/json/sonarr/cf/hdr10plus-boost.json @@ -20,7 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index 7b1b2904f..bf1c656ce 100644 --- a/docs/json/sonarr/cf/hdr10plus.json +++ b/docs/json/sonarr/cf/hdr10plus.json @@ -20,7 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" + "value": "^(?=.*\\b(HDR(10)?(?!\\+))\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { From 0cf14138fcc3785dff38a27f1538587359bb17f0 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 6 Jan 2023 20:15:30 +0100 Subject: [PATCH 2/3] Fix: Emby/JF naming scheme for imdbid - Fix: Emby/JF naming scheme for imdbid --- docs/json/radarr/naming/radarr-naming.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/json/radarr/naming/radarr-naming.json b/docs/json/radarr/naming/radarr-naming.json index fa2ab144c..2de61a107 100644 --- a/docs/json/radarr/naming/radarr-naming.json +++ b/docs/json/radarr/naming/radarr-naming.json @@ -7,11 +7,11 @@ }, "file": { "default": "{Movie CleanTitle} {(Release Year)} {imdb-{ImdbId}} {edition-{Edition Tags}} {[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group}", - "emby": "{Movie CleanTitle} {(Release Year)} {[imdbid-{ImdbId}]} - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group}", - "jellyfin": "{Movie CleanTitle} {(Release Year)} {[imdbid-{ImdbId}]} - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group}", + "emby": "{Movie CleanTitle} {(Release Year)} [imdbid-{ImdbId}] - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group}", + "jellyfin": "{Movie CleanTitle} {(Release Year)} [imdbid-{ImdbId}] - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group}", "anime": "{Movie CleanTitle} {(Release Year)} {imdb-{ImdbId}} {edition-{Edition Tags}} {[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{MediaInfo VideoBitDepth}bit][{Mediainfo VideoCodec}]{-Release Group}", - "anime-emby": "{Movie CleanTitle} {(Release Year)} {[imdbid-{ImdbId}]} - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{MediaInfo VideoBitDepth}bit][{Mediainfo VideoCodec}]{-Release Group}", - "anime-jellyfin": "{Movie CleanTitle} {(Release Year)} {[imdbid-{ImdbId}]} - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{MediaInfo VideoBitDepth}bit][{Mediainfo VideoCodec}]{-Release Group}", + "anime-emby": "{Movie CleanTitle} {(Release Year)} [imdbid-{ImdbId}] - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{MediaInfo VideoBitDepth}bit][{Mediainfo VideoCodec}]{-Release Group}", + "anime-jellyfin": "{Movie CleanTitle} {(Release Year)} [imdbid-{ImdbId}] - {Edition Tags }{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{MediaInfo VideoBitDepth}bit][{Mediainfo VideoCodec}]{-Release Group}", "original": "{Original Title}" } } From c02f16ec41ecc99a5782ca9e3f64d1c7661d0bee Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 6 Jan 2023 21:14:50 +0100 Subject: [PATCH 3/3] Updated: regex example - Updated: regex example --- docs/json/radarr/cf/dv-hdr10.json | 2 +- docs/json/sonarr/cf/dv-hdr10.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 831f76f7c..a30bf5c52 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/5", + "trash_regex": "https://regex101.com/r/pADWJD/8", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index 3df94b899..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/pADWJD/5", + "trash_regex": "https://regex101.com/r/pADWJD/8", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [