[gnome-software: 3/11] appstream: Port gs_plugin_add_categories() vfunc to GsPluginJobListCategories
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 3/11] appstream: Port gs_plugin_add_categories() vfunc to GsPluginJobListCategories
- Date: Mon, 18 Jul 2022 09:57:06 +0000 (UTC)
commit 5673275938538d704d285b16301dc9fe47a8729b
Author: Philip Withnall <pwithnall endlessos org>
Date: Thu Jul 14 17:12:31 2022 +0100
appstream: Port gs_plugin_add_categories() vfunc to GsPluginJobListCategories
Signed-off-by: Philip Withnall <pwithnall endlessos org>
Helps: #1472
plugins/core/gs-plugin-appstream.c | 67 +++++++++++++++++++++++++++++++++-----
1 file changed, 58 insertions(+), 9 deletions(-)
---
diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
index fce863c3a..d6ff5f29d 100644
--- a/plugins/core/gs-plugin-appstream.c
+++ b/plugins/core/gs-plugin-appstream.c
@@ -1335,21 +1335,68 @@ refine_wildcard (GsPluginAppstream *self,
return TRUE;
}
-gboolean
-gs_plugin_add_categories (GsPlugin *plugin,
- GPtrArray *list,
- GCancellable *cancellable,
- GError **error)
+static void refine_categories_thread_cb (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable);
+
+static void
+gs_plugin_appstream_refine_categories_async (GsPlugin *plugin,
+ GPtrArray *list,
+ GsPluginRefineCategoriesFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GsPluginAppstream *self = GS_PLUGIN_APPSTREAM (plugin);
+ g_autoptr(GTask) task = NULL;
+ gboolean interactive = (flags & GS_PLUGIN_REFINE_CATEGORIES_FLAGS_INTERACTIVE);
+
+ task = gs_plugin_refine_categories_data_new_task (plugin, list, flags,
+ cancellable, callback, user_data);
+ g_task_set_source_tag (task, gs_plugin_appstream_refine_categories_async);
+
+ /* Queue a job to get the apps. */
+ gs_worker_thread_queue (self->worker, get_priority_for_interactivity (interactive),
+ refine_categories_thread_cb, g_steal_pointer (&task));
+}
+
+/* Run in @worker. */
+static void
+refine_categories_thread_cb (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
+{
+ GsPluginAppstream *self = GS_PLUGIN_APPSTREAM (source_object);
g_autoptr(GRWLockReaderLocker) locker = NULL;
+ GsPluginRefineCategoriesData *data = task_data;
+ g_autoptr(GError) local_error = NULL;
- if (!gs_plugin_appstream_check_silo (self, cancellable, error))
- return FALSE;
+ assert_in_worker (self);
+
+ /* check silo is valid */
+ if (!gs_plugin_appstream_check_silo (self, cancellable, &local_error)) {
+ g_task_return_error (task, g_steal_pointer (&local_error));
+ return;
+ }
locker = g_rw_lock_reader_locker_new (&self->silo_lock);
- return gs_appstream_add_categories (self->silo, list,
- cancellable, error);
+
+ if (!gs_appstream_add_categories (self->silo, data->list, cancellable, &local_error)) {
+ g_task_return_error (task, g_steal_pointer (&local_error));
+ return;
+ }
+
+ g_task_return_boolean (task, TRUE);
+}
+
+static gboolean
+gs_plugin_appstream_refine_categories_finish (GsPlugin *plugin,
+ GAsyncResult *result,
+ GError **error)
+{
+ return g_task_propagate_boolean (G_TASK (result), error);
}
static void list_apps_thread_cb (GTask *task,
@@ -1584,6 +1631,8 @@ gs_plugin_appstream_class_init (GsPluginAppstreamClass *klass)
plugin_class->list_apps_finish = gs_plugin_appstream_list_apps_finish;
plugin_class->refresh_metadata_async = gs_plugin_appstream_refresh_metadata_async;
plugin_class->refresh_metadata_finish = gs_plugin_appstream_refresh_metadata_finish;
+ plugin_class->refine_categories_async = gs_plugin_appstream_refine_categories_async;
+ plugin_class->refine_categories_finish = gs_plugin_appstream_refine_categories_finish;
}
GType
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]