tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-03-05 13:40:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: (Cardigann) Prevent fetching the first page multiple times

Browse Source
This commit is contained in:
Bogdan
2023-02-26 01:26:00 +02:00
parent e94aa7c499
commit 24f6c937da
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
View File

@@ -129,8 +129,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
{
var defaultSettings = new List<SettingsField>
{
new SettingsField { Name = "username", Label = "Username", Type = "text" },
new SettingsField { Name = "password", Label = "Password", Type = "password" }
new () { Name = "username", Label = "Username", Type = "text" },
new () { Name = "password", Label = "Password", Type = "password" }
};
var settings = definition.Settings ?? defaultSettings;

21
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View File

@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.TraktID"] = searchCriteria.TraktId?.ToString() ?? null;
variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null;
pageableRequests.Add(GetRequest(variables));
pageableRequests.Add(GetRequest(variables, searchCriteria));
return pageableRequests;
}
@@ -79,7 +79,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null;
variables[".Query.Track"] = searchCriteria.Track;
pageableRequests.Add(GetRequest(variables));
pageableRequests.Add(GetRequest(variables, searchCriteria));
return pageableRequests;
}
@@ -107,7 +107,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null;
variables[".Query.Episode"] = searchCriteria.EpisodeSearchString;
pageableRequests.Add(GetRequest(variables));
pageableRequests.Add(GetRequest(variables, searchCriteria));
return pageableRequests;
}
@@ -126,7 +126,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Publisher"] = searchCriteria.Publisher;
variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null;
pageableRequests.Add(GetRequest(variables));
pageableRequests.Add(GetRequest(variables, searchCriteria));
return pageableRequests;
}
@@ -139,7 +139,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
var variables = GetQueryVariableDefaults(searchCriteria);
pageableRequests.Add(GetRequest(variables));
pageableRequests.Add(GetRequest(variables, searchCriteria));
return pageableRequests;
}
@@ -1015,8 +1015,17 @@ namespace NzbDrone.Core.Indexers.Cardigann
return false;
}
private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables)
private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables, SearchCriteriaBase searchCriteria)
{
var limit = searchCriteria.Limit ?? 100;
var offset = searchCriteria.Offset ?? 0;
if (offset > 0 && limit > 0 && offset / limit > 0)
{
// Pagination doesn't work yet, this is to prevent fetching the first page multiple times.
yield break;
}
var search = _definition.Search;
var mappedCategories = _categories.MapTorznabCapsToTrackers((int[])variables[".Query.Categories"]);