[libdazzle] tests: use libdazzle mutable index for fuzzy search
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdazzle] tests: use libdazzle mutable index for fuzzy search
- Date: Sun, 4 Jun 2017 19:56:06 +0000 (UTC)
commit 6bf1de25d9c11e0f1d96350d6bd602278d9f3a67
Author: Christian Hergert <chergert redhat com>
Date: Sun Jun 4 12:55:51 2017 -0700
tests: use libdazzle mutable index for fuzzy search
tests/fuzzy.c | 617 -----------------------------------------------
tests/fuzzy.h | 62 -----
tests/meson.build | 2 +-
tests/test-suggestion.c | 18 +-
4 files changed, 9 insertions(+), 690 deletions(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index f9a5075..bf04a5d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -89,7 +89,7 @@ test_stack_list = executable('test-stack-list', 'test-stack-list.c',
dependencies: libdazzle_deps + [libdazzle_dep],
)
-test_suggestion = executable('test-suggestion', 'test-suggestion.c', 'fuzzy.c', 'fuzzy.h',
+test_suggestion = executable('test-suggestion', 'test-suggestion.c',
c_args: test_cflags,
link_args: test_link_args,
dependencies: libdazzle_deps + [libdazzle_dep],
diff --git a/tests/test-suggestion.c b/tests/test-suggestion.c
index eebf1f5..7687c1e 100644
--- a/tests/test-suggestion.c
+++ b/tests/test-suggestion.c
@@ -19,8 +19,6 @@
#include <string.h>
#include <dazzle.h>
-#include "fuzzy.h"
-
/*
* Most of this is exactly how you SHOULD NOT write a web browser
* shell. It's just dummy code to test the suggestions widget.
@@ -35,7 +33,7 @@ typedef struct
const gchar *suffix;
} DemoData;
-static Fuzzy *search_index;
+static DzlFuzzyMutableIndex *search_index;
static const DemoData demo_data[] = {
{ NULL, "https://twitter.com", "Twitter", "twitter.com" },
{ NULL, "https://facebook.com", "Facebook", "facebook.com" },
@@ -77,8 +75,8 @@ static gint
compare_match (gconstpointer a,
gconstpointer b)
{
- const FuzzyMatch *match_a = a;
- const FuzzyMatch *match_b = b;
+ const DzlFuzzyMutableIndexMatch *match_a = a;
+ const DzlFuzzyMutableIndexMatch *match_b = b;
if (match_a->score < match_b->score)
return 1;
@@ -119,18 +117,18 @@ create_search_results (const gchar *full_query,
g_autofree gchar *with_slashes = g_strdup_printf ("://%s", query);
gboolean exact = FALSE;
- matches = fuzzy_match (search_index, query, 20);
+ matches = dzl_fuzzy_mutable_index_match (search_index, query, 20);
g_array_sort (matches, compare_match);
for (guint i = 0; i < matches->len; i++)
{
- const FuzzyMatch *match = &g_array_index (matches, FuzzyMatch, i);
+ const DzlFuzzyMutableIndexMatch *match = &g_array_index (matches, DzlFuzzyMutableIndexMatch, i);
const DemoData *data = match->value;
g_autofree gchar *markup = NULL;
DzlSuggestion *item;
- markup = fuzzy_highlight (search_index, data->url, query);
+ markup = dzl_fuzzy_highlight (data->url, query, FALSE);
if (g_str_has_suffix (data->url, with_slashes))
exact = TRUE;
@@ -237,13 +235,13 @@ main (gint argc,
gtk_init (&argc, &argv);
- search_index = fuzzy_new (FALSE);
+ search_index = dzl_fuzzy_mutable_index_new (FALSE);
for (guint i = 0; i < G_N_ELEMENTS (demo_data); i++)
{
const DemoData *data = &demo_data[i];
- fuzzy_insert (search_index, data->url, (gpointer)data);
+ dzl_fuzzy_mutable_index_insert (search_index, data->url, (gpointer)data);
}
window = g_object_new (GTK_TYPE_WINDOW,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]