From 3c17260c72ae2c8c27be6666d2dda636ebb9ba86 Mon Sep 17 00:00:00 2001 From: Stevie Robinson Date: Sun, 23 Jul 2023 02:13:05 +0200 Subject: [PATCH] New: Update naming examples --- .../MediaManagement/Naming/NamingModal.js | 32 ++++++++--------- .../FileNameBuilderTests/CleanTitleFixture.cs | 2 ++ .../CleanTitleWithoutYearFixture.cs | 2 ++ .../CleanTitleYearFixture.cs | 1 + .../Organizer/FileNameSampleService.cs | 36 +++++++++---------- 5 files changed, 39 insertions(+), 34 deletions(-) diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js index 3d2530048..8bbca7dad 100644 --- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js +++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js @@ -30,28 +30,28 @@ const caseOptions = [ const fileNameTokens = [ { token: '{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}', - example: 'Series Title (2010) - S01E01 - Episode Title HDTV-720p Proper' + example: 'The Series Title\'s! (2010) - S01E01 - Episode Title HDTV-720p Proper' }, { token: '{Series Title} - {season:0}x{episode:00} - {Episode Title} {Quality Full}', - example: 'Series Title (2010) - 1x01 - Episode Title HDTV-720p Proper' + example: 'The Series Title\'s! (2010) - 1x01 - Episode Title HDTV-720p Proper' }, { token: '{Series.Title}.S{season:00}E{episode:00}.{EpisodeClean.Title}.{Quality.Full}', - example: 'Series.Title.(2010).S01E01.Episode.Title.HDTV-720p' + example: 'The.Series.Title\'s!.(2010).S01E01.Episode.Title.HDTV-720p' } ]; const seriesTokens = [ - { token: '{Series Title}', example: 'Series Title\'s' }, - { token: '{Series CleanTitle}', example: 'Series Titles' }, - { token: '{Series CleanTitleYear}', example: 'Series Titles! 2010' }, - { token: '{Series CleanTitleWithoutYear}', example: 'Series Titles!' }, - { token: '{Series TitleThe}', example: 'Series Title\'s, The' }, - { token: '{Series TitleTheYear}', example: 'Series Title\'s, The (2010)' }, - { token: '{Series TitleTheWithoutYear}', example: 'Series Title\'s, The' }, - { token: '{Series TitleYear}', example: 'Series Title\'s (2010)' }, - { token: '{Series TitleWithoutYear}', example: 'Series Title\'s' }, + { token: '{Series Title}', example: 'The Series Title\'s!' }, + { token: '{Series CleanTitle}', example: 'The Series Title\'s!' }, + { token: '{Series CleanTitleYear}', example: 'The Series Titles! 2010' }, + { token: '{Series CleanTitleWithoutYear}', example: 'The Series Title\'s!' }, + { token: '{Series TitleThe}', example: 'Series Title\'s!, The' }, + { token: '{Series TitleTheYear}', example: 'Series Title\'s!, The (2010)' }, + { token: '{Series TitleTheWithoutYear}', example: 'Series Title\'s!, The' }, + { token: '{Series TitleYear}', example: 'The Series Title\'s! (2010)' }, + { token: '{Series TitleWithoutYear}', example: 'Series Title\'s!' }, { token: '{Series TitleFirstCharacter}', example: 'S' }, { token: '{Series Year}', example: '2010' } ]; @@ -89,8 +89,8 @@ const episodeTitleTokens = [ ]; const qualityTokens = [ - { token: '{Quality Full}', example: 'HDTV-720p Proper' }, - { token: '{Quality Title}', example: 'HDTV-720p' } + { token: '{Quality Full}', example: 'WEBDL-1080p Proper' }, + { token: '{Quality Title}', example: 'WEBDL-1080p' } ]; const mediaInfoTokens = [ @@ -114,8 +114,8 @@ const otherTokens = [ ]; const originalTokens = [ - { token: '{Original Title}', example: 'Series.Title.S01E01.HDTV.x264-EVOLVE' }, - { token: '{Original Filename}', example: 'series.title.s01e01.hdtv.x264-EVOLVE' } + { token: '{Original Title}', example: 'The.Series.Title\'s!.S01E01.WEBDL.1080p.x264-EVOLVE' }, + { token: '{Original Filename}', example: 'the.series.title\'s!.s01e01.webdl.1080p.x264-EVOLVE' } ]; class NamingModal extends Component { diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs index 3c7a17c8a..674522748 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs @@ -70,6 +70,8 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests [TestCase("[a] title", "a title")] [TestCase("backslash \\ backlash", "backslash backlash")] [TestCase("I'm the Boss", "Im the Boss")] + [TestCase("The Title's", "The Title's")] + [TestCase("I'm after I'm", "Im after I'm")] // [TestCase("", "")] public void should_get_expected_title_back(string title, string expected) diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleWithoutYearFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleWithoutYearFixture.cs index 1cf761402..8e3a3f0b7 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleWithoutYearFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleWithoutYearFixture.cs @@ -54,6 +54,8 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests [TestCase("The Mist", 2018, "The Mist")] [TestCase("The Rat Pack (A&E)", 1999, "The Rat Pack AandE")] [TestCase("The Climax: I (Almost) Got Away With It (2016)", 2016, "The Climax I Almost Got Away With It")] + [TestCase("The Series Title's (2016)", 2016, "The Series Titles")] + [TestCase("The Series Title's", 2016, "The Series Title's")] public void should_get_expected_title_back(string title, int year, string expected) { _series.Title = title; diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs index 8ed607983..92fce8e8d 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs @@ -54,6 +54,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests [TestCase("The Mist", 2018, "The Mist 2018")] [TestCase("The Rat Pack (A&E)", 1999, "The Rat Pack AandE 1999")] [TestCase("The Climax: I (Almost) Got Away With It (2016)", 2016, "The Climax I Almost Got Away With It 2016")] + [TestCase("The Series Title's", 2016, "The Series Titles 2016")] public void should_get_expected_title_back(string title, int year, string expected) { _series.Title = title; diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs index 6e66633d3..a8d89364a 100644 --- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs +++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core.Organizer _standardSeries = new Series { SeriesType = SeriesTypes.Standard, - Title = "The Series Title!", + Title = "The Series Title's!", Year = 2010, ImdbId = "tt12345", TvdbId = 12345, @@ -54,7 +54,7 @@ namespace NzbDrone.Core.Organizer _dailySeries = new Series { SeriesType = SeriesTypes.Daily, - Title = "The Series Title!", + Title = "The Series Title's!", Year = 2010, ImdbId = "tt12345", TvdbId = 12345, @@ -64,7 +64,7 @@ namespace NzbDrone.Core.Organizer _animeSeries = new Series { SeriesType = SeriesTypes.Anime, - Title = "The Series Title!", + Title = "The Series Title's!", Year = 2010, ImdbId = "tt12345", TvdbId = 12345, @@ -141,45 +141,45 @@ namespace NzbDrone.Core.Organizer _singleEpisodeFile = new EpisodeFile { - Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), - RelativePath = "Series.Title.S01E01.720p.HDTV.x264-EVOLVE.mkv", - SceneName = "Series.Title.S01E01.720p.HDTV.x264-EVOLVE", + Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)), + RelativePath = "The.Series.Title's!.S01E01.1080p.WEBDL.x264-EVOLVE.mkv", + SceneName = "The.Series.Title's!.S01E01.1080p.WEBDL.x264-EVOLVE", ReleaseGroup = "RlsGrp", MediaInfo = mediaInfo }; _multiEpisodeFile = new EpisodeFile { - Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), - RelativePath = "Series.Title.S01E01-E03.720p.HDTV.x264-EVOLVE.mkv", - SceneName = "Series.Title.S01E01-E03.720p.HDTV.x264-EVOLVE", + Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)), + RelativePath = "The.Series.Title's!.S01E01-E03.1080p.WEBDL.x264-EVOLVE.mkv", + SceneName = "The.Series.Title's!.S01E01-E03.1080p.WEBDL.x264-EVOLVE", ReleaseGroup = "RlsGrp", MediaInfo = mediaInfo, }; _dailyEpisodeFile = new EpisodeFile { - Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), - RelativePath = "Series.Title.2013.10.30.HDTV.x264-EVOLVE.mkv", - SceneName = "Series.Title.2013.10.30.HDTV.x264-EVOLVE", + Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)), + RelativePath = "The.Series.Title's!.2013.10.30.1080p.WEBDL.x264-EVOLVE.mkv", + SceneName = "The.Series.Title's!.2013.10.30.1080p.WEBDL.x264-EVOLVE", ReleaseGroup = "RlsGrp", MediaInfo = mediaInfo }; _animeEpisodeFile = new EpisodeFile { - Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), - RelativePath = "[RlsGroup] Series Title - 001 [720p].mkv", - SceneName = "[RlsGroup] Series Title - 001 [720p]", + Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)), + RelativePath = "[RlsGroup] The Series Title's! - 001 [1080P].mkv", + SceneName = "[RlsGroup] The Series Title's! - 001 [1080P]", ReleaseGroup = "RlsGrp", MediaInfo = mediaInfoAnime }; _animeMultiEpisodeFile = new EpisodeFile { - Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), - RelativePath = "[RlsGroup] Series Title - 001 - 103 [720p].mkv", - SceneName = "[RlsGroup] Series Title - 001 - 103 [720p]", + Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)), + RelativePath = "[RlsGroup] The Series Title's! - 001 - 103 [1080p].mkv", + SceneName = "[RlsGroup] The Series Title's! - 001 - 103 [1080p]", ReleaseGroup = "RlsGrp", MediaInfo = mediaInfoAnime };