mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-14 03:37:10 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Apply search precision filter on assignment

Browse Source 
The search precision must be used, so it makes sense to apply the filter
directly on score assignment. Score will be "0" if precision filter
was not met.
This commit is contained in:
SysC0mp 2019-12-03 14:58:52 +01:00
parent 3d55ad783e
commit 6ebca7fa7c
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Wox.Infrastructure/StringMatcher.cs
View File

@ -120,19 +120,6 @@ namespace Wox.Infrastructure
None = 0
}
public static bool IsSearchPrecisionScoreMet(this MatchResult matchResult)
{
var precisionScore = (SearchPrecisionScore)Enum.Parse(typeof(SearchPrecisionScore),
UserSettingSearchPrecision ?? SearchPrecisionScore.Regular.ToString());
return matchResult.Score >= (int)precisionScore;
}
public static int ScoreAfterSearchPrecisionFilter(this MatchResult matchResult)
{
return matchResult.IsSearchPrecisionScoreMet() ? matchResult.Score : 0;
}
public static int ScoreForPinyin(string source, string target)
{
if (!string.IsNullOrEmpty(source) && !string.IsNullOrEmpty(target))
@ -164,12 +151,42 @@ namespace Wox.Infrastructure
public class MatchResult
{
public bool Success { get; set; }
public int Score { get; set; }
private int _score;
public int Score
{
get
{
return _score;
}
set
{
_score = ApplySearchPrecisionFilter(value);
}
}
/// <summary>
/// highlight string
/// Matched data to highlight.
/// </summary>
public string Value { get; set; }
public List<int> MatchData { get; set; }
public bool IsSearchPrecisionScoreMet()
{
return IsSearchPrecisionScoreMet(Score);
}
private bool IsSearchPrecisionScoreMet(int score)
{
var precisionScore = (SearchPrecisionScore)Enum.Parse(
typeof(SearchPrecisionScore),
UserSettingSearchPrecision ?? SearchPrecisionScore.Regular.ToString());
return score >= (int)precisionScore;
}
private int ApplySearchPrecisionFilter(int score)
{
return IsSearchPrecisionScoreMet(score) ? score : 0;
}
}
public class MatchOption