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

CouchPotato - Change prefilter to allow results with no year #158

This commit is contained in:
KZ 2015-08-31 20:52:15 +01:00
parent 1fa36925ad
commit 1e3de38db7
1 changed files with 86 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Jackett/Utils/TorznabCapsUtil.cs
View File

@ -12,6 +12,8 @@ namespace Jackett.Utils
{
static Regex reduceSpacesRegex = new Regex("\\s{2,}", RegexOptions.Compiled);
static Regex findYearRegex = new Regex(@"(?<=\[|\(|\s)(\d{4})(?=\]|\)|\s)", RegexOptions.Compiled);
public static TorznabCapabilities CreateDefaultTorznabTVCaps()
{
var caps = new TorznabCapabilities();
@ -23,7 +25,22 @@ namespace Jackett.Utils
return caps;
}
public static IEnumerable<ReleaseInfo> FilterResultsToTitle(IEnumerable<ReleaseInfo> results, string name, int year)
private static int GetYearFromTitle(string title)
{
var match = findYearRegex.Match(title);
if (match.Success)
{
var year = ParseUtil.CoerceInt(match.Value);
if(year>1850 && year < 2100)
{
return year;
}
}
return 0;
}
public static IEnumerable<ReleaseInfo> FilterResultsToTitle(IEnumerable<ReleaseInfo> results, string name, int imdbYear)
{
if (string.IsNullOrWhiteSpace(name))
return results;
@ -34,10 +51,16 @@ namespace Jackett.Utils
{
if (result.Title == null)
continue;
if (CleanTitle(result.Title).Contains(name) &&
(year ==0 || result.Title.Contains(year.ToString())))
// Match on title
if (CleanTitle(result.Title).Contains(name))
{
filteredResults.Add(result);
// Match on year
var titleYear = GetYearFromTitle(result.Title);
if (imdbYear == 0 || titleYear == 0 || titleYear == imdbYear)
{
filteredResults.Add(result);
}
}
}