shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: refactor results post processing: filter and fixing results (#10082)

Browse Source
This commit is contained in:
Diego Heras
2020-11-02 14:20:13 +01:00
committed by GitHub
parent 27d7d1b48c
commit 6413ad8fd4
5 changed files with 89 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Jackett.Common/Indexers/BaseIndexer.cs
View File

@@ -263,20 +263,44 @@ namespace Jackett.Common.Indexers
protected virtual IEnumerable<ReleaseInfo> FilterResults(TorznabQuery query, IEnumerable<ReleaseInfo> results)
{
if (query.Categories.Length == 0)
return results;
var filteredResults = results;
// expand parent categories from the query
var expandedQueryCats = TorznabCaps.Categories.ExpandTorznabQueryCategories(query);
// filter results with wrong categories
if (query.Categories.Length > 0)
{
// expand parent categories from the query
var expandedQueryCats = TorznabCaps.Categories.ExpandTorznabQueryCategories(query);
var filteredResults = results.Where(result =>
result.Category?.Any() != true ||
expandedQueryCats.Intersect(result.Category).Any()
filteredResults = filteredResults.Where(result =>
result.Category?.Any() != true ||
expandedQueryCats.Intersect(result.Category).Any()
);
}
// eliminate excess results
if (query.Limit > 0)
filteredResults = filteredResults.Take(query.Limit);
return filteredResults;
}
protected virtual IEnumerable<ReleaseInfo> FixResults(TorznabQuery query, IEnumerable<ReleaseInfo> results)
{
var fixedResults = results.Select(r =>
{
// add origin
r.Origin = this;
// fix publish date
// some trackers do not keep their clocks up to date and can be ~20 minutes out!
if (r.PublishDate > DateTime.Now)
r.PublishDate = DateTime.Now;
return r;
});
return fixedResults;
}
public virtual bool CanHandleQuery(TorznabQuery query)
{
if (query == null)
@@ -328,26 +352,14 @@ namespace Jackett.Common.Indexers
public virtual async Task<IndexerResult> ResultsForQuery(TorznabQuery query)
{
if (!CanHandleQuery(query))
return new IndexerResult(this, new ReleaseInfo[0]);
try
{
if (!CanHandleQuery(query))
return new IndexerResult(this, new ReleaseInfo[0]);
var results = await PerformQuery(query);
results = FilterResults(query, results);
if (query.Limit > 0)
{
results = results.Take(query.Limit);
}
results = results.Select(r =>
{
r.Origin = this;
// Some trackers do not keep their clocks up to date and can be ~20 minutes out!
if (r.PublishDate > DateTime.Now)
r.PublishDate = DateTime.Now;
return r;
});
results = FixResults(query, results);
return new IndexerResult(this, results);
}
catch (Exception ex)