Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Take keywords and generic name into account for relevancy #439

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Take keywords and generic name into account for relevancy #439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2a081
Include keywords when performing fuzzy searches
Sep 1, 2023
85d7fbb
Merge branch 'main' into main
JoshStrobl Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 45 additions & 20 deletions src/appindexer/RelevancyService.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Budgie {
* Arbitrary threshold that scores have to be below to
* be considered "relevant."
*/
public const int THRESHOLD = 16;
public const int THRESHOLD = 18;

/** Static map of desktop IDs to scores. */
private static Gee.HashMap<string, int> scores;
Expand Down Expand Up @@ -104,11 +104,26 @@ namespace Budgie {
return;
}

string name = searchable_string(app.name);
string _term = term.casefold();

// Get a initial score based on the fuzzy match of the name
var score = Fuzzer.get_fuzzy_score(name, _term, 1);
string?[] data = {
app.name,
app.generic_name,
};
foreach (var k in app.keywords) {
data += k;
}

// Get an initial best score from the fuzzy match of name, generic_name and keywords
int score = get_best_score(data, _term);

// Score is less than 0, disqualified
if (score < 0) {
scores.set(app.desktop_id, score);
return;
}

string name = app.name.casefold();

// If the term is considered to be an exact match, bail early
if (score == 0) {
Expand All @@ -121,33 +136,21 @@ namespace Budgie {
return;
}

// Score is less than 0, disqualified
if (score < 0) {
scores.set(app.desktop_id, score);
return;
// Prioritize matches where the name contains the exact term
if (name.contains(_term)) {
score--;
}

string?[] fields = {
app.generic_name,
app.description,
app.exec
};

// Check the various fields, and decrease the score
// for every match
// Check the various fields, prioritize if there's a match
if (array_contains(fields, _term)) {
score--;
}

// Check the application's keywords
var keywords = app.keywords;
if (keywords != null && keywords.length > 0) {
// Decrease the score for every match
if (array_contains(keywords, _term)) {
score--;
}
}

// Check if the application is the default handler for its supported
// MIME types
if (name.contains(_term) && is_default_handler(app)) {
Expand All @@ -159,6 +162,28 @@ namespace Budgie {
scores.set(app.desktop_id, int.max(score, 0));
}

/**
* Retrieve the highest score by performing a fuzzy match on a list of strings
*/
private int get_best_score(string?[] elements, string term) {
int score = -1;

foreach (var e in elements) {
if (e == null) {
continue;
}

string target = searchable_string(e);
int tmp_score = Fuzzer.get_fuzzy_score(target, term, 1);

if (tmp_score >= 0 && (tmp_score < score || score == -1)) {
score = tmp_score;
}
EbonJaeger marked this conversation as resolved.
Show resolved Hide resolved
}

return score;
}

/* Helper ported from Brisk */
private bool array_contains(string?[] array, string term) {
foreach (string? field in array) {
Expand Down