From af105d59f7fd72ab08b0d55cb845651672908427 Mon Sep 17 00:00:00 2001 From: thatbritguy <10825337+thatbritguy@users.noreply.github.com> Date: Fri, 19 Aug 2022 22:50:38 +0100 Subject: [PATCH 1/5] Update naming scheme to support Plex Editions Updated Radarr naming scheme to support Plex Multiple Editions tags and conditional IMDb tags. #723 --- .../Radarr-recommended-naming-scheme.md | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/Radarr/Radarr-recommended-naming-scheme.md b/docs/Radarr/Radarr-recommended-naming-scheme.md index 307f05169..db037b5aa 100644 --- a/docs/Radarr/Radarr-recommended-naming-scheme.md +++ b/docs/Radarr/Radarr-recommended-naming-scheme.md @@ -15,7 +15,7 @@ The Tokens not available in the release won't be used/shown. ## Standard Movie Format -This naming scheme is made to be compatible with the [New Plex Agent](https://forums.plex.tv/t/new-plex-media-server-movie-scanner-and-agent-preview/593269/517) that now supports IMDB and TMDB IDs in filenames, if you don't need it or want it just remove `[imdb-{ImdbId}]` +This naming scheme is made to be compatible with the [New Plex Agent](https://forums.plex.tv/t/new-plex-media-server-movie-scanner-and-agent-preview/593269/517) that now supports IMDb and TMDb IDs in filenames, if you don't need it or want it just remove `{imdb-{ImdbId}}` !!! caution "Starting from v4.0.0.5720, Radarr now supports recognizing Dolby Vision (DV) and High Dynamic Range (HDR) types." @@ -23,22 +23,29 @@ This naming scheme is made to be compatible with the [New Plex Agent](https://fo `{[MediaInfo VideoDynamicRangeType]}` with `{[MediaInfo VideoDynamicRange]}` +!!! caution "Starting from v4.2.2.6489, Radarr now supports Plex Multiple Edition tags in naming." + + If you're using a lower version or don't need it replace: + + `{edition-{Edition Tags}}` with `{Edition Tags}` + ```bash -{Movie CleanTitle} {(Release Year)} {Edition Tags} [imdb-{ImdbId}]{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group} +{Movie CleanTitle} {(Release Year)} {edition-{Edition Tags}} {imdb-{ImdbId}}{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group} ``` ??? summary "RESULTS: - [CLICK TO EXPAND]" - `The Movie Title (2010) Ultimate Extended Edition [imdb-tt0066921][IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` + `The Movie Title (2010) {edition-Ultimate Extended Edition} {imdb-tt0066921}[IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` ??? info "If you do Anime - [CLICK TO EXPAND]" ```bash - {Movie CleanTitle} {(Release Year)} {Edition Tags} [imdb-{ImdbId}]{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{Mediainfo VideoCodec}]{-Release Group} + {Movie CleanTitle} {(Release Year)} {edition-{Edition Tags}} {imdb-{ImdbId}}{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{Mediainfo VideoCodec}]{-Release Group} ``` !!! attention "" - The officially supported format is `{imdb-{ImdbId}}` but plex also support `(imdb-{ImdbId})` or `[imdb-{ImdbId}]` what you can read [here](https://forums.plex.tv/t/new-plex-media-server-movie-scanner-and-agent-preview/593269/517){:target="_blank" rel="noopener noreferrer"}, though the above should work for now. IMDb IDs are going to be very accurate and rarely change, but they may be missing for some movies added to Radarr. TMDB IDs, on the other hand, do change or are removed more frequently, but Radarr will always have this ID for each movie. + + The officially supported format is `{imdb-{ImdbId}}` and this is required in Radarr `v4.2.2.6489` and above to make the tags conditional. Plex also support `(imdb-{ImdbId})` or `[imdb-{ImdbId}]` which you can read [here](https://forums.plex.tv/t/new-plex-media-server-movie-scanner-and-agent-preview/593269/517){:target="_blank" rel="noopener noreferrer"}, however Radarr will not treat these as conditional meaning a movie with no IMDb ID would have `(imdb-)` or `[imdb-]` in the name. IMDb IDs are going to be very accurate and rarely change, but they may be missing for some movies added to Radarr. TMDb IDs, on the other hand, do change or are removed more frequently, but Radarr will always have this ID for each movie. ------ @@ -85,7 +92,7 @@ RESULT: !!! quote "Quote from a developer" - TMDb is usually better as it guarantees a match, IMDb only gets matched if the TMDb entry has the correct IMDb ID association. We don't actually talk to IMDb + TMDb is usually better as it guarantees a match, IMDb only gets matched if the TMDb entry has the correct IMDb ID association. We don't actually talk to IMDb... ------ @@ -94,4 +101,4 @@ Thanks: A big Thanks to [fryfrog](https://github.com/fryfrog) and [rg9400](https://github.com/rg9400) for the suggestions. {! include-markdown "../../includes/support.md" !} - + \ No newline at end of file From 56d4de137760c6d43bebd6bde85bfcc2a5f1594b Mon Sep 17 00:00:00 2001 From: thatbritguy <10825337+thatbritguy@users.noreply.github.com> Date: Sun, 21 Aug 2022 15:34:03 +0100 Subject: [PATCH 2/5] Small change to quote ending. Swapped `...` for `.` at end of quote. I think it was just missing punctuation and not actually a partial quote. --- docs/Radarr/Radarr-recommended-naming-scheme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Radarr/Radarr-recommended-naming-scheme.md b/docs/Radarr/Radarr-recommended-naming-scheme.md index db037b5aa..f8947720b 100644 --- a/docs/Radarr/Radarr-recommended-naming-scheme.md +++ b/docs/Radarr/Radarr-recommended-naming-scheme.md @@ -92,7 +92,7 @@ RESULT: !!! quote "Quote from a developer" - TMDb is usually better as it guarantees a match, IMDb only gets matched if the TMDb entry has the correct IMDb ID association. We don't actually talk to IMDb... + TMDb is usually better as it guarantees a match, IMDb only gets matched if the TMDb entry has the correct IMDb ID association. We don't actually talk to IMDb. ------ @@ -101,4 +101,4 @@ Thanks: A big Thanks to [fryfrog](https://github.com/fryfrog) and [rg9400](https://github.com/rg9400) for the suggestions. {! include-markdown "../../includes/support.md" !} - \ No newline at end of file + From 3939993dcff43c81043832bff9520671a4178490 Mon Sep 17 00:00:00 2001 From: thatbritguy <10825337+thatbritguy@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:11:21 +0100 Subject: [PATCH 3/5] Finalise new naming format for Plex Editions Final new naming format to utilise Plex Multiple Edition tags and conditional IMDb tags. --- docs/Radarr/Radarr-recommended-naming-scheme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Radarr/Radarr-recommended-naming-scheme.md b/docs/Radarr/Radarr-recommended-naming-scheme.md index f8947720b..0e0dcf3e5 100644 --- a/docs/Radarr/Radarr-recommended-naming-scheme.md +++ b/docs/Radarr/Radarr-recommended-naming-scheme.md @@ -30,17 +30,17 @@ This naming scheme is made to be compatible with the [New Plex Agent](https://fo `{edition-{Edition Tags}}` with `{Edition Tags}` ```bash -{Movie CleanTitle} {(Release Year)} {edition-{Edition Tags}} {imdb-{ImdbId}}{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group} +{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} ``` ??? summary "RESULTS: - [CLICK TO EXPAND]" - `The Movie Title (2010) {edition-Ultimate Extended Edition} {imdb-tt0066921}[IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` + `The Movie Title (2010) {imdb-tt0066921} {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` ??? info "If you do Anime - [CLICK TO EXPAND]" ```bash - {Movie CleanTitle} {(Release Year)} {edition-{Edition Tags}} {imdb-{ImdbId}}{[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{Mediainfo VideoCodec}]{-Release Group} + {Movie CleanTitle} {(Release Year)} {imdb-{ImdbId}} {edition-{Edition Tags}} {[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{Mediainfo VideoCodec}]{-Release Group} ``` !!! attention "" From fa6e92609d8ec40e8e53e3aa34d706c9a9688a89 Mon Sep 17 00:00:00 2001 From: nuxen Date: Tue, 23 Aug 2022 23:23:59 +0200 Subject: [PATCH 4/5] Fixed: `DTS-HD MA` recognition Fixed the recognition of `DTS-HD MA` for both the Radarr and Sonarr CFs that use the regex. --- docs/json/radarr/cf/dts-hd-ma.json | 2 +- docs/json/radarr/cf/dts.json | 2 +- docs/json/sonarr/cf/dts-hd-ma.json | 2 +- docs/json/sonarr/cf/dts.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/json/radarr/cf/dts-hd-ma.json b/docs/json/radarr/cf/dts-hd-ma.json index cd3871e4a..11ecabcb7 100644 --- a/docs/json/radarr/cf/dts-hd-ma.json +++ b/docs/json/radarr/cf/dts-hd-ma.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" } }, { diff --git a/docs/json/radarr/cf/dts.json b/docs/json/radarr/cf/dts.json index c48636d6d..90cd76f4f 100644 --- a/docs/json/radarr/cf/dts.json +++ b/docs/json/radarr/cf/dts.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" } }, { diff --git a/docs/json/sonarr/cf/dts-hd-ma.json b/docs/json/sonarr/cf/dts-hd-ma.json index a80672447..614610f43 100644 --- a/docs/json/sonarr/cf/dts-hd-ma.json +++ b/docs/json/sonarr/cf/dts-hd-ma.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" } }, { diff --git a/docs/json/sonarr/cf/dts.json b/docs/json/sonarr/cf/dts.json index cf5a1eed1..a872d0cbd 100644 --- a/docs/json/sonarr/cf/dts.json +++ b/docs/json/sonarr/cf/dts.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" } }, { From 63c5a1b5585fcd00d81a1f3805b3f4a0ce14c4e4 Mon Sep 17 00:00:00 2001 From: nuxen Date: Wed, 24 Aug 2022 11:32:04 +0200 Subject: [PATCH 5/5] Updated: Change to cleaner regex for `DTS-HD MA` Changed the regex for recognizing `DTS-HD MA` to make it look a bit nicer. --- docs/json/radarr/cf/dts-hd-ma.json | 2 +- docs/json/radarr/cf/dts.json | 2 +- docs/json/sonarr/cf/dts-hd-ma.json | 2 +- docs/json/sonarr/cf/dts.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/json/radarr/cf/dts-hd-ma.json b/docs/json/radarr/cf/dts-hd-ma.json index 11ecabcb7..3a7dd0350 100644 --- a/docs/json/radarr/cf/dts-hd-ma.json +++ b/docs/json/radarr/cf/dts-hd-ma.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))\\b" } }, { diff --git a/docs/json/radarr/cf/dts.json b/docs/json/radarr/cf/dts.json index 90cd76f4f..c796b7991 100644 --- a/docs/json/radarr/cf/dts.json +++ b/docs/json/radarr/cf/dts.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))\\b" } }, { diff --git a/docs/json/sonarr/cf/dts-hd-ma.json b/docs/json/sonarr/cf/dts-hd-ma.json index 614610f43..0a24545ed 100644 --- a/docs/json/sonarr/cf/dts-hd-ma.json +++ b/docs/json/sonarr/cf/dts-hd-ma.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))\\b" } }, { diff --git a/docs/json/sonarr/cf/dts.json b/docs/json/sonarr/cf/dts.json index a872d0cbd..60c1fca89 100644 --- a/docs/json/sonarr/cf/dts.json +++ b/docs/json/sonarr/cf/dts.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(dts[-_. ]?(ma|hd[-_. ]?ma|hd|xll))\\b" + "value": "\\b(dts[-_. ]?(ma|hd([-_. ]?ma)?|xll))\\b" } }, {