[gnome-software/wip/async-plugin-repo-funcs: 5/5] flatpak: Implement repository remove as an async operation
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/async-plugin-repo-funcs: 5/5] flatpak: Implement repository remove as an async operation
- Date: Tue, 14 Jun 2022 13:43:23 +0000 (UTC)
commit 43896c9fc896974c3b1b4b9dea76dec15e15a0c0
Author: Milan Crha <mcrha redhat com>
Date: Tue Jun 14 15:42:14 2022 +0200
flatpak: Implement repository remove as an async operation
plugins/flatpak/gs-plugin-flatpak.c | 66 ++++++++++++++++++++++++++++++-------
1 file changed, 55 insertions(+), 11 deletions(-)
---
diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c
index 1fe5ce927..63614b5d8 100644
--- a/plugins/flatpak/gs-plugin-flatpak.c
+++ b/plugins/flatpak/gs-plugin-flatpak.c
@@ -2032,24 +2032,66 @@ gs_plugin_flatpak_install_repository_finish (GsPlugin *plugin,
return g_task_propagate_boolean (G_TASK (result), error);
}
-gboolean
-gs_plugin_remove_repo (GsPlugin *plugin,
- GsApp *repo,
- GCancellable *cancellable,
- GError **error)
+static void remove_repository_thread_cb (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable);
+
+static void
+gs_plugin_flatpak_remove_repository_async (GsPlugin *plugin,
+ GsApp *repository,
+ GsPluginManageRepositoryFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GsPluginFlatpak *self = GS_PLUGIN_FLATPAK (plugin);
+ g_autoptr(GTask) task = NULL;
+ gboolean interactive = (flags & GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_INTERACTIVE);
+
+ task = gs_plugin_manage_repository_data_new_task (plugin, repository, flags, cancellable, callback,
user_data);
+ g_task_set_source_tag (task, gs_plugin_flatpak_remove_repository_async);
+
+ gs_worker_thread_queue (self->worker, get_priority_for_interactivity (interactive),
+ remove_repository_thread_cb, g_steal_pointer (&task));
+}
+
+/* Run in @worker. */
+static void
+remove_repository_thread_cb (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
+{
+ GsPluginFlatpak *self = GS_PLUGIN_FLATPAK (source_object);
GsFlatpak *flatpak;
- gboolean interactive = gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE);
+ GsPluginManageRepositoryData *data = task_data;
+ gboolean interactive = (data->flags & GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_INTERACTIVE);
+ g_autoptr(GError) local_error = NULL;
- flatpak = gs_plugin_flatpak_get_handler (self, repo);
- if (flatpak == NULL)
- return TRUE;
+ assert_in_worker (self);
+
+ flatpak = gs_plugin_flatpak_get_handler (self, data->repository);
+ if (flatpak == NULL) {
+ g_task_return_boolean (task, TRUE);
+ return;
+ }
/* is a source */
- g_return_val_if_fail (gs_app_get_kind (repo) == AS_COMPONENT_KIND_REPOSITORY, FALSE);
+ g_warn_if_fail (gs_app_get_kind (data->repository) == AS_COMPONENT_KIND_REPOSITORY);
+
+ if (gs_flatpak_app_remove_source (flatpak, data->repository, TRUE, interactive, cancellable,
&local_error))
+ g_task_return_boolean (task, TRUE);
+ else
+ g_task_return_error (task, g_steal_pointer (&local_error));
+}
- return gs_flatpak_app_remove_source (flatpak, repo, TRUE, interactive, cancellable, error);
+static gboolean
+gs_plugin_flatpak_remove_repository_finish (GsPlugin *plugin,
+ GAsyncResult *result,
+ GError **error)
+{
+ return g_task_propagate_boolean (G_TASK (result), error);
}
gboolean
@@ -2112,6 +2154,8 @@ gs_plugin_flatpak_class_init (GsPluginFlatpakClass *klass)
plugin_class->refresh_metadata_finish = gs_plugin_flatpak_refresh_metadata_finish;
plugin_class->install_repository_async = gs_plugin_flatpak_install_repository_async;
plugin_class->install_repository_finish = gs_plugin_flatpak_install_repository_finish;
+ plugin_class->remove_repository_async = gs_plugin_flatpak_remove_repository_async;
+ plugin_class->remove_repository_finish = gs_plugin_flatpak_remove_repository_finish;
}
GType
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]