Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Update naming examples

This commit is contained in:
Stevie Robinson 2023-07-23 02:13:05 +02:00 committed by GitHub
parent b779c92200
commit 3c17260c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/src/Settings/MediaManagement/Naming/NamingModal.js
View File

@ -30,28 +30,28 @@ const caseOptions = [
const fileNameTokens = [ const fileNameTokens = [
{ {
token: '{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}', 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}', 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}', 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 = [ const seriesTokens = [
{ token: '{Series Title}', example: 'Series Title\'s' }, { token: '{Series Title}', example: 'The Series Title\'s!' },
{ token: '{Series CleanTitle}', example: 'Series Titles' }, { token: '{Series CleanTitle}', example: 'The Series Title\'s!' },
{ token: '{Series CleanTitleYear}', example: 'Series Titles! 2010' }, { token: '{Series CleanTitleYear}', example: 'The Series Titles! 2010' },
{ token: '{Series CleanTitleWithoutYear}', example: 'Series Titles!' }, { token: '{Series CleanTitleWithoutYear}', example: 'The Series Title\'s!' },
{ token: '{Series TitleThe}', example: 'Series Title\'s, The' }, { token: '{Series TitleThe}', example: 'Series Title\'s!, The' },
{ token: '{Series TitleTheYear}', example: 'Series Title\'s, The (2010)' }, { token: '{Series TitleTheYear}', example: 'Series Title\'s!, The (2010)' },
{ token: '{Series TitleTheWithoutYear}', example: 'Series Title\'s, The' }, { token: '{Series TitleTheWithoutYear}', example: 'Series Title\'s!, The' },
{ token: '{Series TitleYear}', example: 'Series Title\'s (2010)' }, { token: '{Series TitleYear}', example: 'The Series Title\'s! (2010)' },
{ token: '{Series TitleWithoutYear}', example: 'Series Title\'s' }, { token: '{Series TitleWithoutYear}', example: 'Series Title\'s!' },
{ token: '{Series TitleFirstCharacter}', example: 'S' }, { token: '{Series TitleFirstCharacter}', example: 'S' },
{ token: '{Series Year}', example: '2010' } { token: '{Series Year}', example: '2010' }
]; ];
@ -89,8 +89,8 @@ const episodeTitleTokens = [
]; ];
const qualityTokens = [ const qualityTokens = [
{ token: '{Quality Full}', example: 'HDTV-720p Proper' }, { token: '{Quality Full}', example: 'WEBDL-1080p Proper' },
{ token: '{Quality Title}', example: 'HDTV-720p' } { token: '{Quality Title}', example: 'WEBDL-1080p' }
]; ];
const mediaInfoTokens = [ const mediaInfoTokens = [
@ -114,8 +114,8 @@ const otherTokens = [
]; ];
const originalTokens = [ const originalTokens = [
{ token: '{Original Title}', example: 'Series.Title.S01E01.HDTV.x264-EVOLVE' }, { token: '{Original Title}', example: 'The.Series.Title\'s!.S01E01.WEBDL.1080p.x264-EVOLVE' },
{ token: '{Original Filename}', example: 'series.title.s01e01.hdtv.x264-EVOLVE' } { token: '{Original Filename}', example: 'the.series.title\'s!.s01e01.webdl.1080p.x264-EVOLVE' }
]; ];
class NamingModal extends Component { class NamingModal extends Component {

2
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
View File

@ -70,6 +70,8 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
[TestCase("[a] title", "a title")] [TestCase("[a] title", "a title")]
[TestCase("backslash \\ backlash", "backslash backlash")] [TestCase("backslash \\ backlash", "backslash backlash")]
[TestCase("I'm the Boss", "Im the Boss")] [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("", "")] // [TestCase("", "")]
public void should_get_expected_title_back(string title, string expected) public void should_get_expected_title_back(string title, string expected)

2
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleWithoutYearFixture.cs
View File

@ -54,6 +54,8 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
[TestCase("The Mist", 2018, "The Mist")] [TestCase("The Mist", 2018, "The Mist")]
[TestCase("The Rat Pack (A&E)", 1999, "The Rat Pack AandE")] [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 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) public void should_get_expected_title_back(string title, int year, string expected)
{ {
_series.Title = title; _series.Title = title;

1
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleYearFixture.cs
View File

@ -54,6 +54,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
[TestCase("The Mist", 2018, "The Mist 2018")] [TestCase("The Mist", 2018, "The Mist 2018")]
[TestCase("The Rat Pack (A&E)", 1999, "The Rat Pack AandE 1999")] [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 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) public void should_get_expected_title_back(string title, int year, string expected)
{ {
_series.Title = title; _series.Title = title;

36
src/NzbDrone.Core/Organizer/FileNameSampleService.cs
View File

@ -44,7 +44,7 @@ namespace NzbDrone.Core.Organizer
_standardSeries = new Series _standardSeries = new Series
{ {
SeriesType = SeriesTypes.Standard, SeriesType = SeriesTypes.Standard,
Title = "The Series Title!", Title = "The Series Title's!",
Year = 2010, Year = 2010,
ImdbId = "tt12345", ImdbId = "tt12345",
TvdbId = 12345, TvdbId = 12345,
@ -54,7 +54,7 @@ namespace NzbDrone.Core.Organizer
_dailySeries = new Series _dailySeries = new Series
{ {
SeriesType = SeriesTypes.Daily, SeriesType = SeriesTypes.Daily,
Title = "The Series Title!", Title = "The Series Title's!",
Year = 2010, Year = 2010,
ImdbId = "tt12345", ImdbId = "tt12345",
TvdbId = 12345, TvdbId = 12345,
@ -64,7 +64,7 @@ namespace NzbDrone.Core.Organizer
_animeSeries = new Series _animeSeries = new Series
{ {
SeriesType = SeriesTypes.Anime, SeriesType = SeriesTypes.Anime,
Title = "The Series Title!", Title = "The Series Title's!",
Year = 2010, Year = 2010,
ImdbId = "tt12345", ImdbId = "tt12345",
TvdbId = 12345, TvdbId = 12345,
@ -141,45 +141,45 @@ namespace NzbDrone.Core.Organizer
_singleEpisodeFile = new EpisodeFile _singleEpisodeFile = new EpisodeFile
{ {
Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)),
RelativePath = "Series.Title.S01E01.720p.HDTV.x264-EVOLVE.mkv", RelativePath = "The.Series.Title's!.S01E01.1080p.WEBDL.x264-EVOLVE.mkv",
SceneName = "Series.Title.S01E01.720p.HDTV.x264-EVOLVE", SceneName = "The.Series.Title's!.S01E01.1080p.WEBDL.x264-EVOLVE",
ReleaseGroup = "RlsGrp", ReleaseGroup = "RlsGrp",
MediaInfo = mediaInfo MediaInfo = mediaInfo
}; };
_multiEpisodeFile = new EpisodeFile _multiEpisodeFile = new EpisodeFile
{ {
Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)),
RelativePath = "Series.Title.S01E01-E03.720p.HDTV.x264-EVOLVE.mkv", RelativePath = "The.Series.Title's!.S01E01-E03.1080p.WEBDL.x264-EVOLVE.mkv",
SceneName = "Series.Title.S01E01-E03.720p.HDTV.x264-EVOLVE", SceneName = "The.Series.Title's!.S01E01-E03.1080p.WEBDL.x264-EVOLVE",
ReleaseGroup = "RlsGrp", ReleaseGroup = "RlsGrp",
MediaInfo = mediaInfo, MediaInfo = mediaInfo,
}; };
_dailyEpisodeFile = new EpisodeFile _dailyEpisodeFile = new EpisodeFile
{ {
Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)),
RelativePath = "Series.Title.2013.10.30.HDTV.x264-EVOLVE.mkv", RelativePath = "The.Series.Title's!.2013.10.30.1080p.WEBDL.x264-EVOLVE.mkv",
SceneName = "Series.Title.2013.10.30.HDTV.x264-EVOLVE", SceneName = "The.Series.Title's!.2013.10.30.1080p.WEBDL.x264-EVOLVE",
ReleaseGroup = "RlsGrp", ReleaseGroup = "RlsGrp",
MediaInfo = mediaInfo MediaInfo = mediaInfo
}; };
_animeEpisodeFile = new EpisodeFile _animeEpisodeFile = new EpisodeFile
{ {
Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)),
RelativePath = "[RlsGroup] Series Title - 001 [720p].mkv", RelativePath = "[RlsGroup] The Series Title's! - 001 [1080P].mkv",
SceneName = "[RlsGroup] Series Title - 001 [720p]", SceneName = "[RlsGroup] The Series Title's! - 001 [1080P]",
ReleaseGroup = "RlsGrp", ReleaseGroup = "RlsGrp",
MediaInfo = mediaInfoAnime MediaInfo = mediaInfoAnime
}; };
_animeMultiEpisodeFile = new EpisodeFile _animeMultiEpisodeFile = new EpisodeFile
{ {
Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), Quality = new QualityModel(Quality.WEBDL1080p, new Revision(2)),
RelativePath = "[RlsGroup] Series Title - 001 - 103 [720p].mkv", RelativePath = "[RlsGroup] The Series Title's! - 001 - 103 [1080p].mkv",
SceneName = "[RlsGroup] Series Title - 001 - 103 [720p]", SceneName = "[RlsGroup] The Series Title's! - 001 - 103 [1080p]",
ReleaseGroup = "RlsGrp", ReleaseGroup = "RlsGrp",
MediaInfo = mediaInfoAnime MediaInfo = mediaInfoAnime
}; };