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

torznabquery: allow accents in match query (#14053)

This commit is contained in:
Bogdan 2023-02-21 01:34:04 +02:00 committed by GitHub
parent d4ca65c641
commit 9d023d05e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Jackett.Common/Extensions/StringExtensions.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
namespace Jackett.Common.Extensions
{
public static class StringExtensions
{
public static bool ContainsIgnoreCase(this string source, string contains) => source != null && contains != null && CultureInfo.InvariantCulture.CompareInfo.IndexOf(source, contains, CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace) >= 0;
public static bool ContainsIgnoreCase(this IEnumerable<string> source, string value) => source.Contains(value, StringComparer.InvariantCultureIgnoreCase);
}
}

20
src/Jackett.Common/Models/TorznabQuery.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;
using Jackett.Common.Extensions;
using Jackett.Common.Utils;
namespace Jackett.Common.Models
@ -187,6 +188,8 @@ namespace Jackett.Common.Models
// With limit we can limit the amount of characters which should be compared (use it if a tracker doesn't return the full title).
public bool MatchQueryStringAND(string title, int? limit = null, string queryStringOverride = null)
{
var commonWords = new[] { "and", "the", "an" };
// We cache the regex split results so we have to do it only once for each query.
if (QueryStringParts == null)
{
@ -196,22 +199,17 @@ namespace Jackett.Common.Models
{
if (limit > queryString.Length)
limit = queryString.Length;
queryString = queryString.Substring(0, (int)limit);
}
var splitRegex = new Regex("[^a-zA-Z0-9]+");
QueryStringParts = splitRegex.Split(queryString);
var splitRegex = new Regex("[^\\w]+");
QueryStringParts = splitRegex.Split(queryString).Where(p => !string.IsNullOrWhiteSpace(p) && p.Length > 1 && !commonWords.ContainsIgnoreCase(p)).ToArray();
}
// Check if each part of the query string is in the given title.
foreach (var queryStringPart in QueryStringParts)
{
if (title.IndexOf(queryStringPart, StringComparison.OrdinalIgnoreCase) < 0)
{
return false;
}
}
return true;
return QueryStringParts.All(title.ContainsIgnoreCase);
}
public string GetEpisodeSearchString()