proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 12:30:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fu-tool: Allow to request post actions from the end user

Browse Source
This commit is contained in:
Gaël PORTAY 2022-05-22 07:38:07 +02:00 committed by Gaël PORTAY
parent 09de8dbc0c
commit bc49afec7a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fu-tool.c
View File

@ -79,7 +79,7 @@ struct FuUtilPrivate {
/* only valid in update and downgrade */ /* only valid in update and downgrade */
FuUtilOperation current_operation; FuUtilOperation current_operation;
FwupdDevice *current_device; FwupdDevice *current_device;
gchar *current_message; GPtrArray *post_requests;
FwupdDeviceFlags completion_flags; FwupdDeviceFlags completion_flags;
FwupdDeviceFlags filter_include; FwupdDeviceFlags filter_include;
FwupdDeviceFlags filter_exclude; FwupdDeviceFlags filter_exclude;
@ -386,7 +386,7 @@ fu_util_private_free(FuUtilPrivate *priv)
g_option_context_free(priv->context); g_option_context_free(priv->context);
if (priv->lock_fd != 0) if (priv->lock_fd != 0)
g_close(priv->lock_fd, NULL); g_close(priv->lock_fd, NULL);
g_free(priv->current_message); g_ptr_array_unref(priv->post_requests);
g_free(priv); g_free(priv);
} }
@ -416,6 +416,10 @@ fu_util_update_device_request_cb(FwupdClient *client, FwupdRequest *request, FuU
tmp = g_strdup_printf("%s %s", fmt, fwupd_request_get_message(request)); tmp = g_strdup_printf("%s %s", fmt, fwupd_request_get_message(request));
fu_progressbar_set_title(priv->progressbar, tmp); fu_progressbar_set_title(priv->progressbar, tmp);
} }
/* save for later */
if (fwupd_request_get_kind(request) == FWUPD_REQUEST_KIND_POST)
g_ptr_array_add(priv->post_requests, g_object_ref(request));
} }
static void static void
@ -915,21 +919,16 @@ fu_util_update_device_changed_cb(FwupdClient *client, FwupdDevice *device, FuUti
g_warning("no FuUtilOperation set"); g_warning("no FuUtilOperation set");
} }
g_set_object(&priv->current_device, device); g_set_object(&priv->current_device, device);
if (priv->current_message == NULL) {
const gchar *tmp = fwupd_device_get_update_message(priv->current_device);
if (tmp != NULL)
priv->current_message = g_strdup(tmp);
}
} }
static void static void
fu_util_display_current_message(FuUtilPrivate *priv) fu_util_display_current_message(FuUtilPrivate *priv)
{ {
if (priv->current_message == NULL) /* print all POST requests */
return; for (guint i = 0; i < priv->post_requests->len; i++) {
g_print("%s\n", priv->current_message); FwupdRequest *request = g_ptr_array_index(priv->post_requests, i);
g_clear_pointer(&priv->current_message, g_free); g_print("%s\n", fwupd_request_get_message(request));
}
} }
static gboolean static gboolean
@ -3423,6 +3422,7 @@ main(int argc, char *argv[])
priv->main_ctx = g_main_context_new(); priv->main_ctx = g_main_context_new();
priv->loop = g_main_loop_new(priv->main_ctx, FALSE); priv->loop = g_main_loop_new(priv->main_ctx, FALSE);
priv->progressbar = fu_progressbar_new(); priv->progressbar = fu_progressbar_new();
priv->post_requests = g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref);
fu_progressbar_set_main_context(priv->progressbar, priv->main_ctx); fu_progressbar_set_main_context(priv->progressbar, priv->main_ctx);
priv->request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE); priv->request = fu_engine_request_new(FU_ENGINE_REQUEST_KIND_ACTIVE);