[gnome-software: 61/72] gs-plugin-loader: Run an explicit refine when filtering

[Philip Withnall <pwithnall src gnome org>]

commit 9d517329dec77f47a0f1b41ff4629fb61e2d51b6
Author: Philip Withnall <pwithnall endlessos org>
Date:   Wed Nov 24 14:20:35 2021 +0000

    gs-plugin-loader: Run an explicit refine when filtering
    
    Rather than running part of the refine functionality internally, we can
    run a full refine job now that it’s split out of `GsPluginLoader` and
    this won’t recurse.
    
    This simplifies refine handling a little.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Helps: #1472

 lib/gs-plugin-loader.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index cc4a2697e..e7fe6935d 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -3533,17 +3533,25 @@ gs_plugin_loader_process_thread_cb (GTask *task,
        max_results = gs_plugin_job_get_max_results (helper->plugin_job);
        sort_func = gs_plugin_job_get_sort_func (helper->plugin_job, NULL);
        if (filter_flags > 0 && max_results > 0 && sort_func != NULL) {
-               g_autoptr(GsPluginLoaderHelper) helper2 = NULL;
-               g_autoptr(GsPluginJob) plugin_job = NULL;
-               plugin_job = gs_plugin_job_refine_new (list, filter_flags);
-               helper2 = gs_plugin_loader_helper_new (helper->plugin_loader, plugin_job);
-               helper2->function_name_parent = helper->function_name;
+               g_autoptr(GsPluginJob) refine_job = NULL;
+               g_autoptr(GAsyncResult) refine_result = NULL;
+
                g_debug ("running filter flags with early refine");
-               if (!gs_plugin_loader_run_refine_filter (helper2, list,
-                                                        filter_flags,
-                                                        cancellable, &error)) {
+
+               refine_job = gs_plugin_job_refine_new (list, filter_flags);
+               gs_plugin_loader_job_process_async (plugin_loader, refine_job,
+                                                   cancellable,
+                                                   async_result_cb,
+                                                   &refine_result);
+
+               /* FIXME: Make this sync until the enclosing function is
+                * refactored to be async. */
+               while (refine_result == NULL)
+                       g_main_context_iteration (g_main_context_get_thread_default (), TRUE);
+
+               if (!gs_plugin_loader_job_process_finish (plugin_loader, refine_result, &error)) {
                        gs_utils_error_convert_gio (&error);
-                       g_task_return_error (task, error);
+                       g_task_return_error (task, g_steal_pointer (&error));
                        return;
                }
        }