[gnome-software/1409-add-available-for-fedora-section-to-the-explore-page: 42/44] flatpak: Implement search for deployment-featured apps
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/1409-add-available-for-fedora-section-to-the-explore-page: 42/44] flatpak: Implement search for deployment-featured apps
- Date: Tue, 10 May 2022 05:45:55 +0000 (UTC)
commit 6055df3de6827d31a70ee11575c5e77e673c13cb
Author: Milan Crha <mcrha redhat com>
Date: Fri May 6 12:08:52 2022 +0200
flatpak: Implement search for deployment-featured apps
plugins/flatpak/gs-flatpak.c | 17 +++++++++++++++++
plugins/flatpak/gs-flatpak.h | 7 +++++++
plugins/flatpak/gs-plugin-flatpak.c | 10 +++++++++-
3 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index c1185413f..049610adf 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -4094,6 +4094,23 @@ gs_flatpak_add_featured (GsFlatpak *self,
return TRUE;
}
+gboolean
+gs_flatpak_add_deployment_featured (GsFlatpak *self,
+ GsAppList *list,
+ gboolean interactive,
+ const gchar *const *deployments,
+ GCancellable *cancellable,
+ GError **error)
+{
+ g_autoptr(GRWLockReaderLocker) locker = NULL;
+
+ if (!gs_flatpak_rescan_app_data (self, interactive, cancellable, error))
+ return FALSE;
+
+ locker = g_rw_lock_reader_locker_new (&self->silo_lock);
+ return gs_appstream_add_deployment_featured (self->silo, deployments, list, cancellable, error);
+}
+
gboolean
gs_flatpak_add_alternates (GsFlatpak *self,
GsApp *app,
diff --git a/plugins/flatpak/gs-flatpak.h b/plugins/flatpak/gs-flatpak.h
index 3c4724897..a704e3b40 100644
--- a/plugins/flatpak/gs-flatpak.h
+++ b/plugins/flatpak/gs-flatpak.h
@@ -146,6 +146,13 @@ gboolean gs_flatpak_add_featured (GsFlatpak *self,
gboolean interactive,
GCancellable *cancellable,
GError **error);
+gboolean gs_flatpak_add_deployment_featured
+ (GsFlatpak *self,
+ GsAppList *list,
+ gboolean interactive,
+ const gchar *const *deployments,
+ GCancellable *cancellable,
+ GError **error);
gboolean gs_flatpak_add_alternates (GsFlatpak *self,
GsApp *app,
GsAppList *list,
diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c
index 4062146f2..8660cc689 100644
--- a/plugins/flatpak/gs-plugin-flatpak.c
+++ b/plugins/flatpak/gs-plugin-flatpak.c
@@ -1914,6 +1914,7 @@ list_apps_thread_cb (GTask *task,
GsAppQueryTristate is_curated = GS_APP_QUERY_TRISTATE_UNSET;
GsCategory *category = NULL;
guint64 age_secs = 0;
+ const gchar * const *deployment_featured = NULL;
g_autoptr(GError) local_error = NULL;
assert_in_worker (self);
@@ -1922,6 +1923,7 @@ list_apps_thread_cb (GTask *task,
released_since = gs_app_query_get_released_since (data->query);
is_curated = gs_app_query_get_is_curated (data->query);
category = gs_app_query_get_category (data->query);
+ deployment_featured = gs_app_query_get_deployment_featured (data->query);
}
if (released_since != NULL) {
@@ -1931,7 +1933,7 @@ list_apps_thread_cb (GTask *task,
/* Currently only support released-since, is-curated and category queries (but only one at once).
* Also don’t currently support is-curated==GS_APP_QUERY_TRISTATE_FALSE. */
- if ((released_since == NULL && is_curated == GS_APP_QUERY_TRISTATE_UNSET && category == NULL) ||
+ if ((released_since == NULL && is_curated == GS_APP_QUERY_TRISTATE_UNSET && category == NULL &&
deployment_featured == NULL) ||
gs_app_query_get_n_properties_set (data->query) != 1 ||
is_curated == GS_APP_QUERY_TRISTATE_FALSE) {
g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
@@ -1959,6 +1961,12 @@ list_apps_thread_cb (GTask *task,
g_task_return_error (task, g_steal_pointer (&local_error));
return;
}
+
+ if (deployment_featured != NULL &&
+ !gs_flatpak_add_deployment_featured (flatpak, list, interactive, deployment_featured,
cancellable, &local_error)) {
+ g_task_return_error (task, g_steal_pointer (&local_error));
+ return;
+ }
}
g_task_return_pointer (task, g_steal_pointer (&list), g_object_unref);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]