[gnome-software: 2/11] appstream: Port gs_plugin_add_alternates() vfunc to GsPluginJobListApps

[Milan Crha <mcrha src gnome org>]

commit ab9737dbe330cc9f5431445c3d54e74855bc2341
Author: Philip Withnall <pwithnall endlessos org>
Date:   Wed Jul 6 13:55:38 2022 +0100

    appstream: Port gs_plugin_add_alternates() vfunc to GsPluginJobListApps
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Helps: #1472

 plugins/core/gs-plugin-appstream.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
index b0d057a25..fce863c3a 100644
--- a/plugins/core/gs-plugin-appstream.c
+++ b/plugins/core/gs-plugin-appstream.c
@@ -1398,6 +1398,7 @@ list_apps_thread_cb (GTask        *task,
        const gchar * const *deployment_featured = NULL;
        const gchar * const *developers = NULL;
        const gchar * const *keywords = NULL;
+       GsApp *alternate_of = NULL;
        g_autoptr(GError) local_error = NULL;
 
        assert_in_worker (self);
@@ -1411,6 +1412,7 @@ list_apps_thread_cb (GTask        *task,
                deployment_featured = gs_app_query_get_deployment_featured (data->query);
                developers = gs_app_query_get_developers (data->query);
                keywords = gs_app_query_get_keywords (data->query);
+               alternate_of = gs_app_query_get_alternate_of (data->query);
        }
        if (released_since != NULL) {
                g_autoptr(GDateTime) now = g_date_time_new_now_utc ();
@@ -1426,7 +1428,8 @@ list_apps_thread_cb (GTask        *task,
             is_installed == GS_APP_QUERY_TRISTATE_UNSET &&
             deployment_featured == NULL &&
             developers == NULL &&
-            keywords == NULL) ||
+            keywords == NULL &&
+            alternate_of == NULL) ||
            is_curated == GS_APP_QUERY_TRISTATE_FALSE ||
            is_featured == GS_APP_QUERY_TRISTATE_FALSE ||
            is_installed == GS_APP_QUERY_TRISTATE_FALSE ||
@@ -1494,6 +1497,12 @@ list_apps_thread_cb (GTask        *task,
                return;
        }
 
+       if (alternate_of != NULL &&
+           !gs_appstream_add_alternates (self->silo, alternate_of, list, 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);
 }
 
@@ -1505,24 +1514,6 @@ gs_plugin_appstream_list_apps_finish (GsPlugin      *plugin,
        return g_task_propagate_pointer (G_TASK (result), error);
 }
 
-gboolean
-gs_plugin_add_alternates (GsPlugin *plugin,
-                         GsApp *app,
-                         GsAppList *list,
-                         GCancellable *cancellable,
-                         GError **error)
-{
-       GsPluginAppstream *self = GS_PLUGIN_APPSTREAM (plugin);
-       g_autoptr(GRWLockReaderLocker) locker = NULL;
-
-       if (!gs_plugin_appstream_check_silo (self, cancellable, error))
-               return FALSE;
-
-       locker = g_rw_lock_reader_locker_new (&self->silo_lock);
-       return gs_appstream_add_alternates (self->silo, app, list,
-                                           cancellable, error);
-}
-
 static void refresh_metadata_thread_cb (GTask        *task,
                                         gpointer      source_object,
                                         gpointer      task_data,