mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-27 02:07:41 +00:00
Code Issues Releases Wiki Activity

More CleanTitle fixes

Browse source
This commit is contained in:
Mark McDowall 2014-12-23 00:17:55 -08:00
parent a9177128a0
commit 7ec34de3b7
4 changed files with 78 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View file

@ -228,6 +228,7 @@
<Compile Include="MediaFiles\ImportApprovedEpisodesFixture.cs" />
<Compile Include="MediaFiles\MediaFileRepositoryFixture.cs" />
<Compile Include="MetadataSourceTests\TraktSearchSeriesComparerFixture.cs" />
<Compile Include="OrganizerTests\CleanTitleFixture.cs" />
<Compile Include="ParserTests\MiniSeriesEpisodeParserFixture.cs" />
<Compile Include="Qualities\RevisionComparableFixture.cs" />
<Compile Include="RemotePathMappingsTests\RemotePathMappingServiceFixture.cs" />

74
src/NzbDrone.Core.Test/OrganizerTests/CleanTitleFixture.cs Normal file
View file

@ -0,0 +1,74 @@
using System.Collections.Generic;
using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Test.OrganizerTests
{
[TestFixture]
public class CleanTitleFixture : CoreTest<FileNameBuilder>
{
private Series _series;
private Episode _episode;
private EpisodeFile _episodeFile;
private NamingConfig _namingConfig;
[SetUp]
public void Setup()
{
_series = Builder<Series>
.CreateNew()
.With(s => s.Title = "South Park")
.Build();
_episode = Builder<Episode>.CreateNew()
.With(e => e.Title = "City Sushi")
.With(e => e.SeasonNumber = 15)
.With(e => e.EpisodeNumber = 6)
.With(e => e.AbsoluteEpisodeNumber = 100)
.Build();
_episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
_namingConfig = new NamingConfig();
_namingConfig.RenameEpisodes = true;
Mocker.GetMock<INamingConfigService>()
.Setup(c => c.GetConfig()).Returns(_namingConfig);
Mocker.GetMock<IQualityDefinitionService>()
.Setup(v => v.Get(Moq.It.IsAny<Quality>()))
.Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
}
[TestCase("Florence + the Machine", "Florence + the Machine")]
[TestCase("Beyoncé X10", "Beyoncé X10")]
[TestCase("Girlfriends' Guide to Divorce", "Girlfriends Guide to Divorce")]
[TestCase("Rule #23: Never Lie to the Kids", "Rule #23 Never Lie to the Kids")]
[TestCase("Anne Hathaway/Florence + The Machine", "Anne Hathaway Florence + The Machine")]
[TestCase("Chris Rock/Prince", "Chris Rock Prince")]
[TestCase("Karma's a B*tch!", "Karmas a B-tch!")]
[TestCase("Ke$ha: My Crazy Beautiful Life", "Ke$ha My Crazy Beautiful Life")]
[TestCase("$#*! My Dad Says", "$#-! My Dad Says")]
[TestCase("Free! - Iwatobi Swim Club", "Free! Iwatobi Swim Club")]
[TestCase("Tamara Ecclestone: Billion $$ Girl", "Tamara Ecclestone Billion $$ Girl")]
[TestCase("Marvel's Agents of S.H.I.E.L.D.", "Marvels Agents of S.H.I.E.L.D")]
[TestCase("Castle (2009)", "Castle 2009")]
// [TestCase("", "")]
// [TestCase("", "")]
public void should_get_expected_title_back(string title, string expected)
{
_series.Title = title;
_namingConfig.StandardEpisodeFormat = "{Series CleanTitle}";
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
.Should().Be(expected);
}
}
}

32
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
View file

@ -874,37 +874,5 @@ namespace NzbDrone.Core.Test.OrganizerTests
Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
.Should().Be("Sonarr");
}
[Test]
public void should_scenify_series_title_when_using_period_separator()
{
_series.Title = "Girlfriends' Guide to Divorce";
_namingConfig.StandardEpisodeFormat = "{Series.CleanTitle}";
Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
.Should().Be("Girlfriends.Guide.to.Divorce");
}
[Test]
public void should_scenify_episode_title_when_using_period_separator()
{
_episode1.Title = "Rule #23: Never Lie to the Kids";
_namingConfig.StandardEpisodeFormat = "{Episode.CleanTitle}";
Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
.Should().Be("Rule.#23.Never.Lie.to.the.Kids");
}
[Test]
public void should_replace_forward_slash_sign_when_scenifying_episode_title()
{
_episode1.Title = "Anne Hathaway/Florence + The Machine";
_namingConfig.StandardEpisodeFormat = "{Episode.CleanTitle}";
Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
.Should().Be("Anne.Hathaway.Florence.The.Machine");
}
}
}

5
src/NzbDrone.Core/Organizer/FileNameBuilder.cs
View file

@ -56,8 +56,9 @@ namespace NzbDrone.Core.Organizer
private static readonly Regex FileNameCleanupRegex = new Regex(@"([- ._])(\1)+", RegexOptions.Compiled);
private static readonly Regex TrimSeparatorsRegex = new Regex(@"[- ._]$", RegexOptions.Compiled);
private static readonly Regex ScenifyRemoveChars = new Regex(@"[^a-z0-9+#\/ ]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex ScenifyReplaceChars = new Regex(@"[+\/]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
//private static readonly Regex ScenifyRemoveChars = new Regex(@"(?<!$1)[^\w+#\/. ](?!$1)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex ScenifyRemoveChars = new Regex(@"(?<=\s)(,|<|>|\/|\\|;|:|'|""|\||`|~|!|@|$|%|^|&|\*|-|_|=){1}(?=\s)|('|:)(?=s|\s)|(\(|\)|\[|\]|\{|\})", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex ScenifyReplaceChars = new Regex(@"[\/]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly char[] EpisodeTitleTrimCharacters = new[] { ' ', '.', '?' };