Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 76 additions & 0 deletions src/Core/ComponentStore.vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* SPDX-License-Identifier: GPL-3.0-or-later
* SPDX-FileCopyrightText: 2026 elementary, Inc. (https://elementary.io)
*
* Authored by: Leonhard Kargl <leo.kargl@proton.me>
*/

public class AppCenterCore.ComponentStore : Object {
private ListStore _components;
public ListModel components { get { return _components; } }

private Gee.HashMap<string, Component> components_by_id;

construct {
_components = new ListStore (typeof (Component));

components_by_id = new Gee.HashMap<string, Component> ();
}

public void update (Gee.Collection<Package> removed, Gee.Collection<Package> added) {
var new_components = new Gee.HashSet<Component> ();

/* Add added packages to their components, creating new components if necessary */
foreach (var added_package in added) {
var comp_id = added_package.normalized_component_id;
var comp = components_by_id[comp_id];

if (comp == null) {
comp = new Component (comp_id);
new_components.add (comp);
}

components_by_id[comp_id] = comp;

/* No op if package is already in the component */
comp.add_package (added_package);
}

/* Remove removed packages from their components */
foreach (var removed_package in removed) {
var comp_id = removed_package.normalized_component_id;
components_by_id[comp_id].remove_package (removed_package);
}

/* Cleanup empty components */
if (!removed.is_empty) {
for (int i = (int) _components.get_n_items () - 1; i >= 0; i--) {
var component = (Component) _components.get_item (i);
if (component.get_n_items () == 0) {
_components.remove (i);
components_by_id.unset (component.component_id);
}
}
}

/* Add new components */
_components.splice (_components.n_items, 0, new_components.to_array ());
}

public Gee.Collection<Package> get_packages_for_component_id (string id) {
var normalized_component_id = Utils.normalize_component_id (id);
var component = components_by_id[normalized_component_id];
var packages = new Gee.ArrayList<Package> ();

if (component == null) {
return packages;
}

for (uint i = 0; i < component.get_n_items (); i++) {
var package = (Package) component.get_item (i);
packages.add (package);
}

return packages;
}
}
74 changes: 11 additions & 63 deletions src/Core/FlatpakBackend.vala
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
private AsyncQueue<Job> jobs = new AsyncQueue<Job> ();
private Thread<bool> worker_thread;

private Gee.HashMap<string, Component> component_list;
private Gee.HashMap<string, Package> package_list;
private AppStream.Pool user_appstream_pool;
private AppStream.Pool system_appstream_pool;
Expand All @@ -76,7 +75,8 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
public Job.Type job_type { get; protected set; }
public bool working { public get; protected set; }

private ListStore components;
private ComponentStore components;

private ListModel _packages;

private Gtk.SortListModel _sorted_packages;
Expand Down Expand Up @@ -209,6 +209,8 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
}

construct {
components = new ComponentStore ();

// Our listmodel structure including the updates:
// addtional updates => flatten the two models => filter updatable packages => sort updating packages to the top
// /\
Expand All @@ -230,9 +232,7 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
additional_updates = new GLib.ListStore (typeof (Package));
additional_updates.append (runtime_updates);

components = new ListStore (typeof (Component));

_packages = new Gtk.FlattenListModel (components);
_packages = new Gtk.FlattenListModel (components.components);
_packages.items_changed.connect (() => package_list_changed ());

var sorter = new Gtk.StringSorter (new Gtk.PropertyExpression (typeof (Package), null, "name"));
Expand Down Expand Up @@ -284,7 +284,6 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
system_appstream_pool = new AppStream.Pool ();
system_appstream_pool.set_flags (NONE);

component_list = new Gee.HashMap<string, Component> (null, null);
package_list = new Gee.HashMap<string, Package> (null, null);

// Monitor the FlatpakInstallation for changes (e.g. adding/removing remotes)
Expand Down Expand Up @@ -672,20 +671,7 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
}

public Gee.Collection<Package> get_packages_for_component_id (string id) {
var normalized_component_id = Utils.normalize_component_id (id);
var component = component_list[normalized_component_id];
var packages = new Gee.ArrayList<Package> ();

if (component == null) {
return packages;
}

for (uint i = 0; i < component.get_n_items (); i++) {
var package = (Package) component.get_item (i);
packages.add (package);
}

return packages;
return components.get_packages_for_component_id (id);
}

public Package? get_package_for_desktop_id (string desktop_id) {
Expand Down Expand Up @@ -1325,53 +1311,15 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {

if (Thread.self<bool> () != worker_thread) {
// We are in the main thread so update immediately
update_component_store (removed, added);
components.update (removed, added);
} else {
// We are in the worker thread and changing the package liststore
// will trigger signals that update the UI so wrap in Idle to update on the main thread
Idle.add (() => update_component_store (removed, added));
}
}

private bool update_component_store (Gee.Collection<Package> removed, Gee.Collection<Package> added) {
var new_components = new Gee.HashSet<Component> ();

/* Add added packages to their components, creating new components if necessary */
foreach (var added_package in added) {
var comp_id = added_package.normalized_component_id;
var comp = component_list[comp_id];

if (comp == null) {
comp = new Component (comp_id);
new_components.add (comp);
}

component_list[comp_id] = comp;

/* No op if package is already in the component */
comp.add_package (added_package);
}

/* Remove removed packages from their components */
foreach (var removed_package in removed) {
var comp_id = removed_package.normalized_component_id;
component_list[comp_id].remove_package (removed_package);
}

/* Cleanup empty components */
if (!removed.is_empty) {
for (int i = (int) components.get_n_items () - 1; i >= 0; i--) {
var component = (Component) components.get_item (i);
if (component.get_n_items () == 0) {
components.remove (i);
component_list.unset (component.component_id);
}
}
Idle.add (() => {
components.update (removed, added);
return Source.REMOVE;
});
}

/* Add new components */
components.splice (components.n_items, 0, new_components.to_array ());
return Source.REMOVE;
}

private bool validate (AppStream.Component component) {
Expand Down
1 change: 1 addition & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ appcenter_files = files(
'Core' / 'CategoryManager.vala',
'Core/ChangeInformation.vala',
'Core' / 'Component.vala',
'Core' / 'ComponentStore.vala',
'Core/FlatpakBackend.vala',
'Core/HttpClient.vala',
'Core/Job.vala',
Expand Down
Loading