mirror of https://github.com/Jackett/Jackett
nebulance: Move resolution search terms from name to tags (#15070)
This commit is contained in:
parent
aa44dc8649
commit
d9cb7f7c24
|
@ -34,6 +34,8 @@ namespace Jackett.Common.Indexers
|
||||||
protected virtual string APIUrl => SiteLink + "api.php";
|
protected virtual string APIUrl => SiteLink + "api.php";
|
||||||
protected virtual int KeyLength => 32;
|
protected virtual int KeyLength => 32;
|
||||||
|
|
||||||
|
private readonly string[] _moveToTags = { "720p", "1080p", "2160p", "4k" };
|
||||||
|
|
||||||
// TODO: remove ConfigurationDataAPIKey class and use ConfigurationDataPasskey instead
|
// TODO: remove ConfigurationDataAPIKey class and use ConfigurationDataPasskey instead
|
||||||
private new ConfigurationDataAPIKey configData
|
private new ConfigurationDataAPIKey configData
|
||||||
{
|
{
|
||||||
|
@ -170,7 +172,16 @@ namespace Jackett.Common.Indexers
|
||||||
|
|
||||||
var searchString = query.GetQueryString();
|
var searchString = query.GetQueryString();
|
||||||
if (!string.IsNullOrWhiteSpace(searchString))
|
if (!string.IsNullOrWhiteSpace(searchString))
|
||||||
|
{
|
||||||
|
var searchTerms = Regex.Split(searchString, "\\s+").ToList();
|
||||||
|
var movingToTags = searchTerms.Intersect(_moveToTags, StringComparer.OrdinalIgnoreCase).ToList();
|
||||||
|
movingToTags.ForEach(
|
||||||
|
tag => searchTerms.RemoveAll(searchTerm => searchTerm.Equals(tag, StringComparison.OrdinalIgnoreCase)));
|
||||||
|
|
||||||
|
searchString = searchTerms.Join(" ");
|
||||||
|
searchParam["tags"] = new JArray(movingToTags);
|
||||||
searchParam["name"] = "%" + Regex.Replace(searchString, "[\\W]+", "%").Trim() + "%";
|
searchParam["name"] = "%" + Regex.Replace(searchString, "[\\W]+", "%").Trim() + "%";
|
||||||
|
}
|
||||||
|
|
||||||
if (query.IsTvmazeQuery && query.TvmazeID.HasValue)
|
if (query.IsTvmazeQuery && query.TvmazeID.HasValue)
|
||||||
{
|
{
|
||||||
|
@ -235,7 +246,10 @@ namespace Jackett.Common.Indexers
|
||||||
}
|
}
|
||||||
var tags = string.Join(",", item.Value<JArray>("tags"));
|
var tags = string.Join(",", item.Value<JArray>("tags"));
|
||||||
var releaseGenres = validList.Intersect(tags.ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries)).ToList();
|
var releaseGenres = validList.Intersect(tags.ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries)).ToList();
|
||||||
descriptions.Add("Tags: " + string.Join(",", releaseGenres));
|
if (releaseGenres.Count >= 1)
|
||||||
|
{
|
||||||
|
descriptions.Add("Genre: " + string.Join(",", releaseGenres));
|
||||||
|
}
|
||||||
var releaseCats = validCats.Intersect(tags.ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries)).ToList();
|
var releaseCats = validCats.Intersect(tags.ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries)).ToList();
|
||||||
|
|
||||||
var release = new ReleaseInfo
|
var release = new ReleaseInfo
|
||||||
|
|
Loading…
Reference in New Issue