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

Newznab searching is better 

Fixed: Newznab returns better results for multi-word searches
This commit is contained in:
Mark McDowall 2012-09-06 08:37:38 -07:00
parent 4425da8ad9
commit f6952abf39
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NzbDrone.Core.Test/IndexerTests.cs
View File

@ -708,5 +708,17 @@ namespace NzbDrone.Core.Test
parseResults.Should().HaveCount(1);
parseResults[0].ReleaseGroup.Should().Be("tvp");
}
[TestCase("30 Rock", "30%20Rock")]
[TestCase("The Office (US)", "Office%20US")]
[TestCase("Revenge", "Revenge")]
[TestCase(" Top Gear ", "Top%20Gear")]
[TestCase("Breaking Bad", "Breaking%20Bad")]
[TestCase("Top Chef (US)", "Top%20Chef%20US")]
[TestCase("Castle (2009)", "Castle%202009")]
public void newznab_GetQueryTitle_should_return_expected_result(string seriesTitle, string expected)
{
Mocker.Resolve<Newznab>().GetQueryTitle(seriesTitle).Should().Be(expected);
}
}
}

2
NzbDrone.Core/Providers/Indexer/IndexerBase.cs
View File

@ -18,7 +18,7 @@ namespace NzbDrone.Core.Providers.Indexer
private readonly HttpProvider _httpProvider;
protected readonly ConfigProvider _configProvider;
private static readonly Regex TitleSearchRegex = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
protected static readonly Regex TitleSearchRegex = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
protected static readonly Regex RemoveThe = new Regex(@"^the\s", RegexOptions.IgnoreCase | RegexOptions.Compiled);
[Inject]

16
NzbDrone.Core/Providers/Indexer/Newznab.cs
View File

@ -129,5 +129,21 @@ namespace NzbDrone.Core.Providers.Indexer
var hostname = item.Links[0].Uri.DnsSafeHost.ToLower();
return String.Format("{0}_{1}", Name, hostname);
}
public override string GetQueryTitle(string title)
{
title = RemoveThe.Replace(title, string.Empty);
//remove any repeating whitespace
var cleanTitle = TitleSearchRegex.Replace(title, "%20");
cleanTitle = Regex.Replace(cleanTitle, @"(%20){1,100}", "%20");
//Trim %20 from start then then the end
cleanTitle = Regex.Replace(cleanTitle, "^(%20)", "");
cleanTitle = Regex.Replace(cleanTitle, "(%20)$", "");
return cleanTitle;
}
}
}