tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-04-26 23:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup SearchCriteria, Pass Cats from Search to Indexers

Browse Source
This commit is contained in:
Qstick
2020-11-18 15:35:14 -05:00
parent 529102ebcf
commit 6100adc515
25 changed files with 89 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
-15
View File
@@ -82,20 +82,5 @@ namespace NzbDrone.Core.Indexers.Cardigann
return;
}
}
protected static List<int> CategoryIds(List<IndexerCategory> categories)
{
var l = categories.Select(c => c.Id).ToList();
foreach (var category in categories)
{
if (category.SubCategories != null)
{
l.AddRange(CategoryIds(category.SubCategories));
}
}
return l;
}
}
}
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
+22
View File
@@ -9,6 +9,7 @@ using Newtonsoft.Json.Linq;
using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.IndexerSearch.Definitions;
namespace NzbDrone.Core.Indexers.Cardigann
{
@@ -207,6 +208,27 @@ namespace NzbDrone.Core.Indexers.Cardigann
return cats;
}*/
public List<string> MapTorznabCapsToTrackers(int[] searchCategories, bool mapChildrenCatsToParent = false)
{
var queryCats = new List<string>();
foreach (var searchCat in searchCategories)
{
var match = TorznabCatType.AllCats.FirstOrDefault(c => c.Id == searchCat);
if (match != null)
{
queryCats.Add(match.Name);
}
}
var result = _definition.Caps.Categorymappings
.Where(c => queryCats.Contains(c.cat))
.Select(mapping => mapping.id).Distinct().ToList();
return result;
}
protected delegate string TemplateTextModifier(string str);
protected string ApplyGoTemplateText(string template, Dictionary<string, object> variables = null, TemplateTextModifier modifier = null)
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
+15 -20
View File
@@ -28,7 +28,9 @@ namespace NzbDrone.Core.Indexers.Cardigann
var pageableRequests = new IndexerPageableRequestChain();
pageableRequests.Add(GetRequest(null));
var variables = GetBaseTemplateVariables();
pageableRequests.Add(GetRequest(variables));
return pageableRequests;
}
@@ -39,23 +41,24 @@ namespace NzbDrone.Core.Indexers.Cardigann
var pageableRequests = new IndexerPageableRequestChain();
foreach (var queryTitle in searchCriteria.QueryTitles)
{
pageableRequests.Add(GetRequest(string.Format("{0}", queryTitle)));
}
var variables = GetBaseTemplateVariables();
variables[".Query.Type"] = "movie";
variables[".Query.Q"] = searchCriteria.SearchTerm;
variables[".Query.Categories"] = searchCriteria.Categories;
variables[".Query.IMDBID"] = searchCriteria.ImdbId;
variables[".Query.IMDBIDShort"] = null;
variables[".Query.TMDBID"] = searchCriteria.TmdbId;
pageableRequests.Add(GetRequest(variables));
return pageableRequests;
}
private IEnumerable<IndexerRequest> GetRequest(string searchCriteria)
private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables)
{
var search = _definition.Search;
// init template context
var variables = GetBaseTemplateVariables();
variables[".Query.Type"] = null;
variables[".Query.Q"] = searchCriteria;
variables[".Query.Series"] = null;
variables[".Query.Ep"] = null;
variables[".Query.Season"] = null;
@@ -64,13 +67,9 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Limit"] = null;
variables[".Query.Offset"] = null;
variables[".Query.Extended"] = null;
variables[".Query.Categories"] = null;
variables[".Query.APIKey"] = null;
variables[".Query.TVDBID"] = null;
variables[".Query.TVRageID"] = null;
variables[".Query.IMDBID"] = null;
variables[".Query.IMDBIDShort"] = null;
variables[".Query.TMDBID"] = null;
variables[".Query.TVMazeID"] = null;
variables[".Query.TraktID"] = null;
variables[".Query.Album"] = null;
@@ -81,15 +80,11 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Author"] = null;
variables[".Query.Title"] = null;
/*
var mappedCategories = MapTorznabCapsToTrackers(query);
var mappedCategories = MapTorznabCapsToTrackers((int[])variables[".Query.Categories"]);
if (mappedCategories.Count == 0)
{
mappedCategories = _defaultCategories;
}
*/
var mappedCategories = _defaultCategories;
variables[".Categories"] = mappedCategories;
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannSettings.cs
-11
View File
@@ -11,13 +11,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
{
public CardigannSettingsValidator()
{
RuleFor(c => c).Custom((c, context) =>
{
if (c.Categories.Empty())
{
context.AddFailure("'Categories' must be provided");
}
});
}
}
@@ -27,7 +20,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
public CardigannSettings()
{
Categories = new[] { 2000, 2010, 2020, 2030, 2035, 2040, 2045, 2050, 2060 };
MultiLanguages = new List<int>();
ExtraFieldData = new Dictionary<string, object>();
}
@@ -42,9 +34,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
[FieldDefinition(1000, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
[FieldDefinition(1001, Label = "Categories", HelpText = "Comma Separated list, leave blank to disable all categories", Advanced = true)]
public IEnumerable<int> Categories { get; set; }
// Field 8 is used by TorznabSettings MinimumSeeders
// If you need to add another field here, update TorznabSettings as well and this comment
public virtual NzbDroneValidationResult Validate()
src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs
+2 -5
View File
@@ -30,11 +30,8 @@ namespace NzbDrone.Core.Indexers.FileList
}
else
{
foreach (var queryTitle in searchCriteria.QueryTitles)
{
var titleYearSearchQuery = string.Format("{0}", queryTitle);
pageableRequests.Add(GetRequest("search-torrents", string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
}
var titleYearSearchQuery = string.Format("{0}", searchCriteria.SearchTerm);
pageableRequests.Add(GetRequest("search-torrents", string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
}
return pageableRequests;
src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Indexers.HDBits
return pageableRequests;
}
private bool TryAddSearchParameters(TorrentQuery query, SearchCriteriaBase searchCriteria)
private bool TryAddSearchParameters(TorrentQuery query, MovieSearchCriteria searchCriteria)
{
if (searchCriteria.ImdbId.IsNullOrWhiteSpace())
{
src/NzbDrone.Core/Indexers/Definitions/Newznab/Newznab.cs
+1 -17
View File
@@ -82,15 +82,10 @@ namespace NzbDrone.Core.Indexers.Newznab
};
}
private NewznabSettings GetSettings(string url, string apiPath = null, int[] categories = null)
private NewznabSettings GetSettings(string url, string apiPath = null)
{
var settings = new NewznabSettings { BaseUrl = url };
if (categories != null)
{
settings.Categories = categories;
}
if (apiPath.IsNotNullOrWhiteSpace())
{
settings.ApiPath = apiPath;
@@ -123,17 +118,6 @@ namespace NzbDrone.Core.Indexers.Newznab
{
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
var notSupported = Settings.Categories.Except(CategoryIds(capabilities.Categories));
if (notSupported.Any())
{
_logger.Warn($"{Definition.Name} does not support the following categories: {string.Join(", ", notSupported)}. You should probably remove them.");
if (notSupported.Count() == Settings.Categories.Count())
{
return new ValidationFailure(string.Empty, $"This indexer does not support any of the selected categories! (You may need to turn on advanced settings to see them)");
}
}
if (capabilities.SearchParams != null && capabilities.SearchParams.Contains(SearchParam.Q))
{
return null;
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs
+14 -16
View File
@@ -75,11 +75,11 @@ namespace NzbDrone.Core.Indexers.Newznab
// Some indexers might forget to enable movie search, but normal search still works fine. Thus we force a normal search.
if (capabilities.MovieSearchParams != null)
{
pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "movie", ""));
pageableRequests.Add(GetPagedRequests(MaxPages, new int[] { 2000 }, "movie", ""));
}
else if (capabilities.SearchParams != null)
{
pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search", ""));
pageableRequests.Add(GetPagedRequests(MaxPages, new int[] { 2000 }, "search", ""));
}
return pageableRequests;
@@ -89,12 +89,12 @@ namespace NzbDrone.Core.Indexers.Newznab
{
var pageableRequests = new IndexerPageableRequestChain();
AddMovieIdPageableRequests(pageableRequests, MaxPages, Settings.Categories, searchCriteria);
AddMovieIdPageableRequests(pageableRequests, MaxPages, searchCriteria.Categories, searchCriteria);
return pageableRequests;
}
private void AddMovieIdPageableRequests(IndexerPageableRequestChain chain, int maxPages, IEnumerable<int> categories, SearchCriteriaBase searchCriteria)
private void AddMovieIdPageableRequests(IndexerPageableRequestChain chain, int maxPages, IEnumerable<int> categories, MovieSearchCriteria searchCriteria)
{
var includeTmdbSearch = SupportsTmdbSearch && searchCriteria.TmdbId > 0;
var includeImdbSearch = SupportsImdbSearch && searchCriteria.ImdbId.IsNotNullOrWhiteSpace();
@@ -136,20 +136,18 @@ namespace NzbDrone.Core.Indexers.Newznab
if (SupportsSearch)
{
chain.AddTier();
foreach (var queryTitle in searchCriteria.QueryTitles)
var searchQuery = searchCriteria.SearchTerm;
if (!Settings.RemoveYear)
{
var searchQuery = queryTitle;
if (!Settings.RemoveYear)
{
searchQuery = string.Format("{0}", searchQuery);
}
chain.Add(GetPagedRequests(MaxPages,
Settings.Categories,
"movie",
string.Format("&q={0}", NewsnabifyTitle(searchQuery))));
searchQuery = string.Format("{0}", searchQuery);
}
chain.Add(GetPagedRequests(MaxPages,
categories,
"movie",
string.Format("&q={0}", NewsnabifyTitle(searchQuery))));
}
}
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabSettings.cs
-12
View File
@@ -36,14 +36,6 @@ namespace NzbDrone.Core.Indexers.Newznab
public NewznabSettingsValidator()
{
RuleFor(c => c).Custom((c, context) =>
{
if (c.Categories.Empty())
{
context.AddFailure("'Categories' must be provided");
}
});
RuleFor(c => c.BaseUrl).ValidRootUrl();
RuleFor(c => c.ApiPath).ValidUrlBase("/api");
RuleFor(c => c.ApiKey).NotEmpty().When(ShouldHaveApiKey);
@@ -59,7 +51,6 @@ namespace NzbDrone.Core.Indexers.Newznab
public NewznabSettings()
{
ApiPath = "/api";
Categories = new[] { 2000, 2010, 2020, 2030, 2035, 2040, 2045, 2050, 2060 };
MultiLanguages = new List<int>();
}
@@ -75,9 +66,6 @@ namespace NzbDrone.Core.Indexers.Newznab
[FieldDefinition(2, Label = "API Key", Privacy = PrivacyLevel.ApiKey)]
public string ApiKey { get; set; }
[FieldDefinition(3, Label = "Categories", HelpText = "Comma Separated list, leave blank to disable all categories", Advanced = true)]
public IEnumerable<int> Categories { get; set; }
[FieldDefinition(5, Label = "Additional Parameters", HelpText = "Additional Newznab parameters", Advanced = true)]
public string AdditionalParameters { get; set; }
src/NzbDrone.Core/Indexers/Definitions/Nyaa/NyaaRequestGenerator.cs
+1 -4
View File
@@ -60,10 +60,7 @@ namespace NzbDrone.Core.Indexers.Nyaa
{
var pageableRequests = new IndexerPageableRequestChain();
foreach (var queryTitle in searchCriteria.QueryTitles)
{
pageableRequests.Add(GetPagedRequests(MaxPages, PrepareQuery(string.Format("{0}", queryTitle))));
}
pageableRequests.Add(GetPagedRequests(MaxPages, PrepareQuery(string.Format("{0}", searchCriteria.SearchTerm))));
return pageableRequests;
}
src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs
+1 -4
View File
@@ -35,10 +35,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
}
else
{
foreach (var queryTitle in searchCriteria.QueryTitles)
{
pageableRequests.Add(GetRequest(string.Format("{0}", queryTitle)));
}
pageableRequests.Add(GetRequest(string.Format("{0}", searchCriteria.SearchTerm)));
}
return pageableRequests;
src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
+2 -2
View File
@@ -95,9 +95,9 @@ namespace NzbDrone.Core.Indexers.Rarbg
{
requestBuilder.AddQueryParam("search_themoviedb", searchCriteria.TmdbId);
}
else if (searchCriteria.QueryTitles.Count > 0)
else if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
{
requestBuilder.AddQueryParam("search_string", $"{searchCriteria.QueryTitles.First()}");
requestBuilder.AddQueryParam("search_string", $"{searchCriteria.SearchTerm}");
}
if (!Settings.RankedOnly)
src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs
+2 -2
View File
@@ -64,10 +64,10 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
{
requestBuilder.AddQueryParam("imdbid", searchCriteria.ImdbId);
}
else if (searchCriteria.QueryTitles.Count > 0)
else if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
{
//TODO: Hack for now
requestBuilder.AddQueryParam("search", $"{searchCriteria.QueryTitles.First()}");
requestBuilder.AddQueryParam("search", $"{searchCriteria.SearchTerm}");
}
yield return new IndexerRequest(requestBuilder.Build());
src/NzbDrone.Core/Indexers/Definitions/Torznab/Torznab.cs
+1 -17
View File
@@ -69,15 +69,10 @@ namespace NzbDrone.Core.Indexers.Torznab
};
}
private TorznabSettings GetSettings(string url, string apiPath = null, int[] categories = null)
private TorznabSettings GetSettings(string url, string apiPath = null)
{
var settings = new TorznabSettings { BaseUrl = url };
if (categories != null)
{
settings.Categories = categories;
}
if (apiPath.IsNotNullOrWhiteSpace())
{
settings.ApiPath = apiPath;
@@ -110,17 +105,6 @@ namespace NzbDrone.Core.Indexers.Torznab
{
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
var notSupported = Settings.Categories.Except(CategoryIds(capabilities.Categories));
if (notSupported.Any())
{
_logger.Warn($"{Definition.Name} does not support the following categories: {string.Join(", ", notSupported)}. You should probably remove them.");
if (notSupported.Count() == Settings.Categories.Count())
{
return new ValidationFailure(string.Empty, $"This indexer does not support any of the selected categories! (You may need to turn on advanced settings to see them)");
}
}
if (capabilities.SearchParams != null && capabilities.SearchParams.Contains(SearchParam.Q))
{
return null;
src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabSettings.cs
-8
View File
@@ -28,14 +28,6 @@ namespace NzbDrone.Core.Indexers.Torznab
public TorznabSettingsValidator()
{
RuleFor(c => c).Custom((c, context) =>
{
if (c.Categories.Empty())
{
context.AddFailure("'Categories' must be provided");
}
});
RuleFor(c => c.BaseUrl).ValidRootUrl();
RuleFor(c => c.ApiPath).ValidUrlBase("/api");
RuleFor(c => c.ApiKey).NotEmpty().When(ShouldHaveApiKey);