Fast search

src/Core/FlatpakBackend.vala

@@ -448,6 +448,10 @@ public class AppCenterCore.FlatpakBackend : Object {
         return apps.values;
     }
 
+    public SearchEngine get_search_engine () {
+        return new SearchEngine (package_list.values.to_array (), user_appstream_pool);
+    }
+
     public Gee.Collection<Package> search_applications (string query, AppStream.Category? category) {
         var results = new Gee.TreeSet<AppCenterCore.Package> ();
         var comps = user_appstream_pool.search (query);
@@ -501,10 +505,6 @@ public class AppCenterCore.FlatpakBackend : Object {
         return apps.values;
     }
 
-    public Gee.Collection<Package> search_applications_mime (string query) {
-        return new Gee.ArrayList<Package> ();
-    }
-
     public Package? get_package_for_component_id (string id) {
         var suffixed_id = id + ".desktop";
         foreach (var package in package_list.values) {

src/Core/Package.vala

@@ -569,6 +569,31 @@ public class AppCenterCore.Package : Object {
         }
     }
 
+    public uint cached_search_score = 0;
+    public uint matches_search (string[] queries) {
+        // TODO: We don't use AppStream.Component.search_matches_all because it has some broken vapi
+        // (or at least I think so: the c code takes gchar** but vapi says string)
+
+        if (queries.length == 0) {
+            cached_search_score = 0;
+            return 0;
+        }
+
+        uint score = 0;
+        foreach (var query in queries) {
+            var query_score = component.search_matches (query);
+
+            if (query_score == 0) {
+                score = 0;
+                break;
+            }
+
+            score += query_score;
+        }
+        cached_search_score = score / queries.length;
+        return cached_search_score;
+    }
+
     private string? name = null;
     public string? get_name () {
         if (name != null) {

src/Core/SearchEngine.vala

@@ -0,0 +1,63 @@
+/*
+ * SPDX-FileCopyrightText: 2024 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Authored by: Leonhard Kargl <[email protected]>
+ */
+
+public class AppCenterCore.SearchEngine : Object {
+    public ListModel results { get; construct; }
+
+    private ListStore packages;
+    private AppStream.Pool pool;
+
+    private string[] query;
+    private AppStream.Category? category;
+
+    public SearchEngine (Package[] packages, AppStream.Pool pool) {
+        var unique_packages = new Gee.HashMap<string, Package> ();
+        foreach (var package in packages) {
+            var package_component_id = package.normalized_component_id;
+            if (unique_packages.has_key (package_component_id)) {
+                if (package.origin_score > unique_packages[package_component_id].origin_score) {
+                    unique_packages[package_component_id] = package;
+                }
+            } else {
+                unique_packages[package_component_id] = package;
+            }
+        }
+
+        this.packages.splice (0, 0, unique_packages.values.to_array ());
+        this.pool = pool;
+    }
+
+    construct {
+        packages = new ListStore (typeof (Package));
+
+        var filter_model = new Gtk.FilterListModel (packages, new Gtk.CustomFilter ((obj) => {
+            var package = (Package) obj;
+
+            if (category != null && !package.component.is_member_of_category (category)) {
+                return false;
+            }
+
+            return ((Package) obj).matches_search (query) > 0;
+        })) {
+            incremental = true
+        };
+
+        var sort_model = new Gtk.SortListModel (filter_model, new Gtk.CustomSorter ((obj1, obj2) => {
+            var package1 = (Package) obj1;
+            var package2 = (Package) obj2;
+            return (int) (package2.cached_search_score - package1.cached_search_score);
+        }));
+
+        results = sort_model;
+    }
+
+    public void search (string query, AppStream.Category? category) {
+        this.query = pool.build_search_tokens (query);
+        this.category = category;
+        packages.items_changed (0, packages.n_items, packages.n_items);
+    }
+}

src/Views/AppInfoView.vala

@@ -210,7 +210,8 @@ public class AppCenter.Views.AppInfoView : Adw.NavigationPage {
             overflow = VISIBLE
         };
 
-        action_stack = new ActionStack (package);
+        action_stack = new ActionStack ();
+        action_stack.package = package;
 
         var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) {
             halign = Gtk.Align.END,

src/Views/SearchView.vala

@@ -27,8 +27,12 @@ public class AppCenter.SearchView : Adw.NavigationPage {
     public string search_term { get; construct; }
     public bool mimetype { get; set; default = false; }
 
-    private GLib.ListStore list_store;
+    private AppCenterCore.SearchEngine search_engine;
     private Gtk.SearchEntry search_entry;
+    private Gtk.NoSelection selection_model;
+    private Gtk.ListView list_view;
+    private Gtk.ScrolledWindow scrolled;
+    private Gtk.Stack stack;
     private Granite.Placeholder alert_view;
 
     public SearchView (string search_term) {
@@ -61,23 +65,37 @@ public class AppCenter.SearchView : Adw.NavigationPage {
         };
         headerbar.pack_start (new BackButton ());
 
-        list_store = new GLib.ListStore (typeof (AppCenterCore.Package));
+        search_engine = AppCenterCore.FlatpakBackend.get_default ().get_search_engine ();
 
-        var list_box = new Gtk.ListBox () {
-            activate_on_single_click = true,
+        selection_model = new Gtk.NoSelection (search_engine.results);
+
+        var factory = new Gtk.SignalListItemFactory ();
+        factory.setup.connect ((obj) => {
+            var list_item = (Gtk.ListItem) obj;
+            list_item.child = new Widgets.ListPackageRowGrid (null);
+        });
+        factory.bind.connect ((obj) => {
+            var list_item = (Gtk.ListItem) obj;
+            ((Widgets.ListPackageRowGrid) list_item.child).bind ((AppCenterCore.Package) list_item.item);
+        });
+
+        list_view = new Gtk.ListView (selection_model, factory) {
+            single_click_activate = true,
             hexpand = true,
             vexpand = true
         };
-        list_box.bind_model (list_store, create_row_from_package);
-        list_box.set_placeholder (alert_view);
 
-        var scrolled = new Gtk.ScrolledWindow () {
-            child = list_box,
+        scrolled = new Gtk.ScrolledWindow () {
+            child = list_view,
             hscrollbar_policy = Gtk.PolicyType.NEVER
         };
 
+        stack = new Gtk.Stack ();
+        stack.add_child (alert_view);
+        stack.add_child (scrolled);
+
         var toolbarview = new Adw.ToolbarView () {
-            content = scrolled
+            content = stack
         };
         toolbarview.add_top_bar (headerbar);
 
@@ -91,10 +109,10 @@ public class AppCenter.SearchView : Adw.NavigationPage {
             search_entry.grab_focus ();
         });
 
-        list_box.row_activated.connect ((row) => {
-            if (row is Widgets.PackageRow) {
-                show_app (((Widgets.PackageRow) row).get_package ());
-            }
+        selection_model.items_changed.connect (on_items_changed);
+
+        list_view.activate.connect ((index) => {
+            show_app ((AppCenterCore.Package) search_engine.results.get_item (index));
         });
 
         search_entry.search_changed.connect (search);
@@ -113,29 +131,30 @@ public class AppCenter.SearchView : Adw.NavigationPage {
         });
     }
 
-    private void search () {
-        list_store.remove_all ();
+    private void on_items_changed () {
+        list_view.scroll_to (0, NONE, null);
+
+        if (selection_model.n_items > 0) {
+            stack.visible_child = scrolled;
+        } else {
+            stack.visible_child = alert_view;
+        }
+    }
 
+    private void search () {
         if (search_entry.text.length >= VALID_QUERY_LENGTH) {
             var dyn_flathub_link = "<a href='https://flathub.org/apps/search/%s'>%s</a>".printf (search_entry.text, _("Flathub"));
             alert_view.description = _("Try changing search terms. You can also sideload Flatpak apps e.g. from %s").printf (dyn_flathub_link);
 
-            unowned var flatpak_backend = AppCenterCore.FlatpakBackend.get_default ();
-
-            Gee.Collection<AppCenterCore.Package> found_apps;
-
             if (mimetype) {
-                found_apps = flatpak_backend.search_applications_mime (search_entry.text);
-                add_packages (found_apps);
+                // This didn't do anything so TODO
             } else {
-                var category = update_category ();
-
-                found_apps = flatpak_backend.search_applications (search_entry.text, category);
-                add_packages (found_apps);
+                search_engine.search (search_entry.text, update_category ());
             }
 
         } else {
             alert_view.description = _("The search term must be at least 3 characters long.");
+            stack.visible_child = alert_view;
         }
 
         if (mimetype) {
@@ -156,56 +175,4 @@ public class AppCenter.SearchView : Adw.NavigationPage {
         search_entry.placeholder_text = _("Search Apps");
         return null;
     }
-
-    public void add_packages (Gee.Collection<AppCenterCore.Package> packages) {
-        foreach (var package in packages) {
-            // Don't show plugins or fonts in search and category views
-            if (package.kind != AppStream.ComponentKind.ADDON && package.kind != AppStream.ComponentKind.FONT) {
-                GLib.CompareDataFunc<AppCenterCore.Package> sort_fn = (a, b) => {
-                    return compare_packages (a, b);
-                };
-
-                list_store.insert_sorted (package, sort_fn);
-            }
-        }
-    }
-
-    private Gtk.Widget create_row_from_package (Object object) {
-        unowned var package = (AppCenterCore.Package) object;
-        return new Widgets.PackageRow.list (package);
-    }
-
-    private int search_priority (string name) {
-        if (name != null && search_entry.text != "") {
-            var name_lower = name.down ();
-            var term_lower = search_entry.text.down ();
-
-            var term_position = name_lower.index_of (term_lower);
-
-            // App name starts with our search term, highest priority
-            if (term_position == 0) {
-                return 2;
-            // App name contains our search term, high priority
-            } else if (term_position != -1) {
-                return 1;
-            }
-        }
-
-        // Otherwise, normal appstream search ranking order
-        return 0;
-    }
-
-    private int compare_packages (AppCenterCore.Package p1, AppCenterCore.Package p2) {
-        if ((p1.kind == AppStream.ComponentKind.ADDON) != (p2.kind == AppStream.ComponentKind.ADDON)) {
-            return p1.kind == AppStream.ComponentKind.ADDON ? 1 : -1;
-        }
-
-        int sp1 = search_priority (p1.get_name ());
-        int sp2 = search_priority (p2.get_name ());
-        if (sp1 != sp2) {
-            return sp2 - sp1;
-        }
-
-        return p1.get_name ().collate (p2.get_name ());
-    }
 }

src/Widgets/ActionStack.vala

@@ -4,7 +4,27 @@
  */
 
 public class AppCenter.ActionStack : Gtk.Box {
-    public AppCenterCore.Package package { get; construct set; }
+    private AppCenterCore.Package? _package;
+    public AppCenterCore.Package? package {
+        get {
+            return _package;
+        }
+        set {
+            if (package != null) {
+                package.notify["state"].disconnect (on_package_state_changed);
+            }
+
+            _package = value;
+
+            package.notify["state"].connect (on_package_state_changed);
+
+            action_button.package = package;
+            cancel_button.package = package;
+
+            update_action ();
+        }
+    }
+
     public bool show_open { get; set; default = true; }
     public bool updates_view = false;
 
@@ -23,12 +43,8 @@ public class AppCenter.ActionStack : Gtk.Box {
     private Gtk.Revealer action_button_revealer;
     private Gtk.Revealer open_button_revealer;
 
-    public ActionStack (AppCenterCore.Package package) {
-        Object (package: package);
-    }
-
     construct {
-        action_button = new Widgets.HumbleButton (package);
+        action_button = new Widgets.HumbleButton ();
 
         action_button_revealer = new Gtk.Revealer () {
             child = action_button,
@@ -53,7 +69,7 @@ public class AppCenter.ActionStack : Gtk.Box {
         button_box.append (action_button_revealer);
         button_box.append (open_button_revealer);
 
-        cancel_button = new ProgressButton (package);
+        cancel_button = new ProgressButton ();
         cancel_button.clicked.connect (() => action_cancelled ());
 
         var action_button_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.BOTH);
@@ -72,9 +88,6 @@ public class AppCenter.ActionStack : Gtk.Box {
 
         append (stack);
 
-        package.notify["state"].connect (on_package_state_changed);
-        update_action ();
-
         destroy.connect (() => {
             if (state_source > 0) {
                 GLib.Source.remove (state_source);
@@ -157,20 +170,20 @@ public class AppCenter.ActionStack : Gtk.Box {
         }
     }
 
-    private void action_cancelled () {
+    private void action_cancelled () requires (package != null) {
         update_action ();
         package.action_cancellable.cancel ();
     }
 
-    private void launch_package_app () {
+    private void launch_package_app () requires (package != null) {
         try {
             package.launch ();
         } catch (Error e) {
             warning ("Failed to launch %s: %s".printf (package.get_name (), e.message));
         }
     }
 
-    private async void action_clicked () {
+    private async void action_clicked () requires (package != null) {
         if (package.installed && !package.update_available) {
             action_button_revealer.reveal_child = false;
         } else if (package.update_available) {