Simplify MatchConfig

Hardcode error_tolerance_divisor to 4 Close #1412
albertlauncher · Aug 2, 2024 · 61a5061 · 61a5061
1 parent 6e45801
commit 61a5061
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/include/albert/matchconfig.h b/include/albert/matchconfig.h
@@ -14,7 +14,8 @@ struct MatchConfig
     bool ignore_case = true;
     bool ignore_diacritics = true;
     bool ignore_word_order = true;
-    uint error_tolerance_divisor = 0;
+    bool fuzzy = false;
+    static const uint error_tolerance_divisor = 4;
 };
 
 }
diff --git a/plugins b/plugins
diff --git a/src/util/indexqueryhandler.cpp b/src/util/indexqueryhandler.cpp
@@ -12,41 +12,46 @@ using namespace std;
 class IndexQueryHandler::Private
 {
 public:
-    ItemIndex index;
+    unique_ptr<ItemIndex> index;
     std::shared_mutex index_mutex;
 };
 
-IndexQueryHandler::IndexQueryHandler() : d(new Private) {}
+IndexQueryHandler::IndexQueryHandler() : d(new Private()) {}
 
 IndexQueryHandler::~IndexQueryHandler() = default;
 
 void IndexQueryHandler::setIndexItems(vector<IndexItem> &&index_items)
 {
+    // Pointer check not necessary since never called before setFuzzyMatching
     unique_lock l(d->index_mutex);
-    d->index.setItems(::move(index_items));
+    d->index->setItems(::move(index_items));
 }
 
 vector<RankItem> IndexQueryHandler::handleGlobalQuery(const Query *query) const
 {
+    // Pointer check not necessary since never called before setFuzzyMatching
     shared_lock l(d->index_mutex);
-    return d->index.search(query->string(), query->isValid());
+    return d->index->search(query->string(), query->isValid());
 }
 
 bool IndexQueryHandler::supportsFuzzyMatching() const { return true; }
 
 void IndexQueryHandler::setFuzzyMatching(bool fuzzy)
 {
-    if ((bool)d->index.config().error_tolerance_divisor == fuzzy)
+    if (!d->index)
     {
-        auto c = d->index.config();
-
-        if (!fuzzy)
-            c.error_tolerance_divisor = 0;
+        auto c = MatchConfig{.fuzzy = fuzzy};
+        d->index = make_unique<ItemIndex>(c);
+        updateIndexItems();
+    }
+    else if ((bool)d->index->config().fuzzy != fuzzy)
+    {
+        auto c = d->index->config();
+        c.fuzzy = fuzzy;
 
         d->index_mutex.lock();
-        d->index = ItemIndex(c);
+        d->index = make_unique<ItemIndex>(c);
         d->index_mutex.unlock();
-
         updateIndexItems();
     }
 }
diff --git a/src/util/itemindex.cpp b/src/util/itemindex.cpp
@@ -160,7 +160,7 @@ vector<WordMatch> ItemIndex::Private::getWordMatches(const QString &word, const
         matches.emplace_back(*it, word_length);
 
     // Get the (fuzzy) prefix matches
-    if (config.error_tolerance_divisor)
+    if (config.fuzzy)
     {
         // Exclusion range for already collected prefix matches
         Index exclude_begin = eq_begin - index.words.begin();  // Ignore interval. closed begin [
@@ -305,7 +305,7 @@ void ItemIndex::setItems(vector<albert::IndexItem> &&index_items)
     }
     new_index.words.shrink_to_fit();
 
-    if (d->config.error_tolerance_divisor)
+    if (d->config.fuzzy)
     {
         // Build n_gram_index
         for (Index word_index = 0; word_index < (Index)new_index.words.size(); ++word_index)

diff --git a/src/util/matcher.cpp b/src/util/matcher.cpp
@@ -64,7 +64,7 @@ class MatcherPrivate
             if ((it->size() <= oit->size()))
             {
                 // check if the query word is a prefix of the matched word
-                if(config.error_tolerance_divisor)  // fuzzy
+                if(config.fuzzy)
                 {
                     uint allowed_errors = it->size() / config.error_tolerance_divisor;
                     auto edit_distance = levenshtein.computePrefixEditDistanceWithLimit(
+1 −1		bluetooth/CMakeLists.txt
+2 −0		bluetooth/src/plugin.h
+6 −1		bluetooth/src/plugin.mm
+1 −1		chromium/CMakeLists.txt
+23 −18		chromium/src/plugin.cpp
+13 −5		chromium/src/plugin.h
+1 −1		urlhandler/CMakeLists.txt
+3 −2		urlhandler/src/plugin.cpp