mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Replace periods in title with nothing when searching indexers

This commit is contained in:
Mark McDowall 2014-11-13 22:03:07 -08:00
parent 83a64fb8b8
commit d765d1eaef
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs
View File

@ -12,6 +12,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
[TestCase("Star Wars: The Clone Wars", Result = "Star+Wars+The+Clone+Wars")] [TestCase("Star Wars: The Clone Wars", Result = "Star+Wars+The+Clone+Wars")]
[TestCase("Hawaii Five-0", Result = "Hawaii+Five+0")] [TestCase("Hawaii Five-0", Result = "Hawaii+Five+0")]
[TestCase("Franklin & Bash", Result = "Franklin+and+Bash")] [TestCase("Franklin & Bash", Result = "Franklin+and+Bash")]
[TestCase("Chicago P.D.", Result = "Chicago+PD")]
public string should_replace_some_special_characters(string input) public string should_replace_some_special_characters(string input)
{ {
Subject.SceneTitles = new List<string> { input }; Subject.SceneTitles = new List<string> { input };

8
src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs
View File

@ -9,6 +9,7 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
{ {
public abstract class SearchCriteriaBase public abstract class SearchCriteriaBase
{ {
private static readonly Regex SpecialCharacter = new Regex(@"[`'.]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
private static readonly Regex NonWord = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled); private static readonly Regex NonWord = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
private static readonly Regex BeginningThe = new Regex(@"^the\s", RegexOptions.IgnoreCase | RegexOptions.Compiled); private static readonly Regex BeginningThe = new Regex(@"^the\s", RegexOptions.IgnoreCase | RegexOptions.Compiled);
@ -30,11 +31,8 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
var cleanTitle = BeginningThe.Replace(title, String.Empty); var cleanTitle = BeginningThe.Replace(title, String.Empty);
cleanTitle = cleanTitle cleanTitle = cleanTitle.Replace("&", "and");
.Replace("&", "and") cleanTitle = SpecialCharacter.Replace(cleanTitle, "");
.Replace("`", "")
.Replace("'", "");
cleanTitle = NonWord.Replace(cleanTitle, "+"); cleanTitle = NonWord.Replace(cleanTitle, "+");
//remove any repeating +s //remove any repeating +s