From 2a2330548c6c86ee5acfbd2f490936566b794493 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 23 Dec 2014 16:37:21 -0800 Subject: [PATCH] Some more test cases for CleanTitle --- src/NzbDrone.Core.Test/OrganizerTests/CleanTitleFixture.cs | 6 +++++- src/NzbDrone.Core/Organizer/FileNameBuilder.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core.Test/OrganizerTests/CleanTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/CleanTitleFixture.cs index b49084537..24fc0798b 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/CleanTitleFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/CleanTitleFixture.cs @@ -61,7 +61,11 @@ namespace NzbDrone.Core.Test.OrganizerTests [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("Law & Order (UK)", "Law and Order UK")] -// [TestCase("", "")] + [TestCase("Is this okay?", "Is this okay")] + [TestCase("[a] title", "a title")] + [TestCase("backslash \\ backlash", "backslash backlash")] + //[TestCase("", "")] + //[TestCase("", "")] public void should_get_expected_title_back(string title, string expected) { _series.Title = title; diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index fb0ba8767..73605ccdc 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -56,7 +56,7 @@ 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(@"(?<=\s)(,|<|>|\/|\\|;|:|'|""|\||`|~|!|@|$|%|^|&|\*|-|_|=){1}(?=\s)|('|:)(?=s|\s)|(\(|\)|\[|\]|\{|\})", 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[] { ' ', '.', '?' };