From 2eafa75aa202ba5fd36c7ddc546c60b5b5d4c875 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 15 Sep 2023 00:20:24 +0200 Subject: [PATCH] fix(guide): tmp fix for emby naming scheme (#1561) --- .../Radarr-recommended-naming-scheme.md | 66 +++++++++++++------ .../Sonarr-recommended-naming-scheme.md | 28 ++++---- docs/json/radarr/naming/radarr-naming.json | 6 +- docs/json/sonarr/naming/sonarr-naming.json | 2 +- 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/docs/Radarr/Radarr-recommended-naming-scheme.md b/docs/Radarr/Radarr-recommended-naming-scheme.md index d12b5c545..acc0a0ace 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){:target="_blank" rel="noopener noreferrer"} that now supports IMDb and TMDb IDs in filenames, if you don't need it or want it just remove `{imdb-{ImdbId}}` !!! warning "Starting from v4.2.2.6489, Radarr now supports Plex Multiple Edition tags in naming." @@ -25,6 +25,8 @@ This naming scheme is made to be compatible with the [New Plex Agent](https://fo !!! danger "Only use `{edition-{Edition Tags}}` if you are prepared to have movies separated by edition
when using a merged Plex library - e.g., you keep both 1080p and 2160p versions of one movie.

For example if you have the `Directors Cut` and the `Extended Cut` for one movie, those will show up as two separate movies in your library.

Note that not using `{edition-{Edition Tags}}` will prevent Plex from recognizing the edition." +### Plex + ```bash {{ radarr['naming']['radarr-naming']['file']['default'] }} ``` @@ -33,27 +35,29 @@ This naming scheme is made to be compatible with the [New Plex Agent](https://fo `The Movie Title (2010) {imdb-tt0066921} {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` -For Jellyfin/Emby: +#### Plex Anime ```bash -{{ radarr['naming']['radarr-naming']['file']['emby'] }} +{{ radarr['naming']['radarr-naming']['file']['anime'] }} ``` ??? abstract "RESULTS: - [Click to show/hide]" - `The Movie Title (2010) [imdbid-tt0066921] {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` + `The Movie Title (2010) {imdb-tt0066921} {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE` -If you do Anime +### Emby + +!!! warning "Emby is the only one who uses `=` for their ID, which isn't supported by the Starr apps at the moment.
Keep a eye on the following [PR#1386](https://github.com/TRaSH-Guides/Guides/pull/1386){:target="_blank" rel="noopener noreferrer"} when it does support it" ```bash -{{ radarr['naming']['radarr-naming']['file']['anime'] }} +{{ radarr['naming']['radarr-naming']['file']['emby'] }} ``` ??? abstract "RESULTS: - [Click to show/hide]" - `The Movie Title (2010) {imdb-tt0066921} {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE` + `The Movie Title (2010) - {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` -For Jellyfin/Emby: +#### Emby Anime ```bash {{ radarr['naming']['radarr-naming']['file']['anime-emby'] }} @@ -61,7 +65,27 @@ For Jellyfin/Emby: ??? abstract "RESULTS: - [Click to show/hide]" - `The Movie Title (2010) [imdbid-tt0066921] {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE` + `The Movie Title (2010) [imdbid-tt0066921] - {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE` + +### Jellyfin + +```bash +{{ radarr['naming']['radarr-naming']['file']['jellyfin'] }} +``` + +??? abstract "RESULTS: - [Click to show/hide]" + + `The Movie Title (2010) [imdbid-tt0066921] - {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE` + +#### Jellyfin Anime + +```bash +{{ radarr['naming']['radarr-naming']['file']['anime-jellyfin'] }} +``` + +??? abstract "RESULTS: - [Click to show/hide]" + + `The Movie Title (2010) [imdbid-tt0066921] - {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE` ------ @@ -99,9 +123,7 @@ The filename can be Obscured where the Release naming isn't, especially when you {{ radarr['naming']['radarr-naming']['folder']['default'] }} ``` -RESULT: - -`The Movie Title (2010)` +RESULT: `The Movie Title (2010)` ------ @@ -114,29 +136,35 @@ RESULT: 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. -#### Optional Movies Folder Format for the Plex Movies Scanner and Jellyfin/Emby +#### Optional Movies Folder Format This naming scheme is made to be compatible with the new [Plex TV Series Scanner](https://forums.plex.tv/t/beta-new-plex-tv-series-scanner/696242){:target="_blank" rel="noopener noreferrer"} that now support IMDB and TVDB IDs in file names. -For Plex: +##### Optional Plex ```bash {{ radarr['naming']['radarr-naming']['folder']['plex'] }} ``` -RESULT: +RESULT: `The Movie Title (2010) {imdb-tt1520211}` -`The Movie Title (2010) {imdb-tt1520211}` +##### Optional Emby -For Jellyfin/Emby: +!!! warning "Emby is the only one who uses `=` for their ID, which isn't supported by the Starr apps at the moment.
Keep a eye on the following [PR#1386](https://github.com/TRaSH-Guides/Guides/pull/1386){:target="_blank" rel="noopener noreferrer"} when it does support it" ```bash {{ radarr['naming']['radarr-naming']['folder']['emby'] }} ``` -RESULT: +RESULT: `The Movie Title (2010)` + +##### Optional Jellyfin + +```bash +{{ radarr['naming']['radarr-naming']['folder']['jellyfin'] }} +``` -`The Movie Title (2010) [imdbid-tt1520211]` +RESULT: `The Movie Title (2010) [imdbid-tt1520211]` !!! tip IMDb IDs are going to be very accurate and rarely change, TVDB/TMDB IDs, on the other hand, do change or are removed more frequently. diff --git a/docs/Sonarr/Sonarr-recommended-naming-scheme.md b/docs/Sonarr/Sonarr-recommended-naming-scheme.md index 01e5d143f..571bac230 100644 --- a/docs/Sonarr/Sonarr-recommended-naming-scheme.md +++ b/docs/Sonarr/Sonarr-recommended-naming-scheme.md @@ -85,33 +85,37 @@ it gets imported correctly and isn't incorrectly matched as HDTV or WEB-DL etc. {{ sonarr['naming']['sonarr-naming']['series']['default'] }} ``` -RESULT: +RESULT: `The Series Title! (2010)` -`The Series Title! (2010)` - -#### Optional Series Folder Format for the Plex TV Series Scanner and Jellyfin/Emby +#### Optional Series Folder Format This naming scheme is made to be compatible with the new [Plex TV Series Scanner](https://forums.plex.tv/t/beta-new-plex-tv-series-scanner/696242){:target="_blank" rel="noopener noreferrer"} that now support IMDB and TVDB IDs in file names. -For Plex: +##### Optional Plex ```bash {{ sonarr['naming']['sonarr-naming']['series']['plex'] }} ``` -RESULT: +RESULT: `The Series Title! (2010) {imdb-tt1520211}` -`The Series Title! (2010) {imdb-tt1520211}` +##### Optional Emby -For Jellyfin/Emby: +!!! warning "Emby is the only one who uses `=` for their ID, which isn't supported by the Starr apps at the moment.
Keep a eye on the following [PR#1386](https://github.com/TRaSH-Guides/Guides/pull/1386){:target="_blank" rel="noopener noreferrer"} when it does support it" ```bash {{ sonarr['naming']['sonarr-naming']['series']['emby'] }} ``` -RESULT: +RESULT: `The Series Title! (2010)` + +##### Optional Jellyfin + +```bash +{{ sonarr['naming']['sonarr-naming']['series']['jellyfin'] }} +``` -`The Series Title! (2010) [tvdbid-tt1520211]` +RESULT: `The Series Title! (2010) [tvdbid-tt1520211]` !!! tip IMDb IDs are going to be very accurate and rarely change, TVDB/TMDB IDs, on the other hand, do change or are removed more frequently. @@ -126,9 +130,7 @@ For this there's only one real option to use in my opinion. Season {season:00} ``` -RESULT: - -`Season 01` +RESULT: `Season 01` ------ diff --git a/docs/json/radarr/naming/radarr-naming.json b/docs/json/radarr/naming/radarr-naming.json index 9d33a675f..728ee885d 100644 --- a/docs/json/radarr/naming/radarr-naming.json +++ b/docs/json/radarr/naming/radarr-naming.json @@ -2,15 +2,15 @@ "folder": { "default": "{Movie CleanTitle} ({Release Year})", "plex": "{Movie CleanTitle} ({Release Year}) {imdb-{ImdbId}}", - "emby": "{Movie CleanTitle} ({Release Year}) [imdbid-{ImdbId}]", + "emby": "{Movie CleanTitle} ({Release Year})", "jellyfin": "{Movie CleanTitle} ({Release Year}) [imdbid-{ImdbId}]" }, "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}", + "emby": "{Movie CleanTitle} {(Release Year)} - {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-emby": "{Movie CleanTitle} {(Release Year)} - {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}" } diff --git a/docs/json/sonarr/naming/sonarr-naming.json b/docs/json/sonarr/naming/sonarr-naming.json index f0755432c..028060bdb 100644 --- a/docs/json/sonarr/naming/sonarr-naming.json +++ b/docs/json/sonarr/naming/sonarr-naming.json @@ -5,7 +5,7 @@ "series": { "default": "{Series TitleYear}", "plex": "{Series TitleYear} {imdb-{ImdbId}}", - "emby": "{Series TitleYear} [tvdbid-{TvdbId}]", + "emby": "{Series TitleYear}", "jellyfin": "{Series TitleYear} [tvdbid-{TvdbId}]" }, "episodes": {