proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2026-03-27 12:15:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Download in-process when using fwupdtool

Browse Source 
This also means we get progress completion.
This commit is contained in:
Richard Hughes 2022-05-10 10:20:44 +01:00 committed by Mario Limonciello
parent 861881691e
commit b149300a9f
3 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build-windows.sh
View File

@ -53,7 +53,7 @@ CERTDIR=/etc/pki/tls/certs
MINGW32BINDIR=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
# copy deps
cp -f -v $MINGW32BINDIR/curl.exe \
cp -f -v \
$MINGW32BINDIR/gspawn-win64-helper-console.exe \
$MINGW32BINDIR/gspawn-win64-helper.exe \
$MINGW32BINDIR/iconv.dll \

3
contrib/ci/build_windows.sh
View File

@ -90,8 +90,7 @@ MINGW32BINDIR=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
# deps
find $MINGW32BINDIR \
-name curl.exe \
-o -name gspawn-win64-helper-console.exe \
-name gspawn-win64-helper-console.exe \
-o -name gspawn-win64-helper.exe \
-o -name iconv.dll \
-o -name libarchive-13.dll \

86
src/fu-tool.c
View File

@ -85,6 +85,16 @@ struct FuUtilPrivate {
FwupdDeviceFlags filter_exclude;
};
static void
fu_util_client_notify_cb(GObject *object, GParamSpec *pspec, FuUtilPrivate *priv)
{
if (priv->as_json)
return;
fu_progressbar_update(priv->progressbar,
fwupd_client_get_status(priv->client),
fwupd_client_get_percentage(priv->client));
}
static gboolean
fu_util_save_current_state(FuUtilPrivate *priv, GError **error)
{
@ -1115,47 +1125,11 @@ fu_util_release_sort_cb(gconstpointer a, gconstpointer b)
return fu_release_compare(release1, release2);
}
static void
fu_util_stdout_cb(const gchar *line, gpointer user_data)
{
if (g_getenv("FWUPD_DOWNLOAD_VERBOSE") != NULL)
g_debug("'%s'", line);
}
static gboolean
fu_util_download_out_of_process(const gchar *uri, const gchar *fn, GError **error)
{
#ifdef _WIN32
g_autofree gchar *basedir = fu_common_get_path(FU_PATH_KIND_WIN32_BASEDIR);
g_autofree gchar *cert = g_build_filename(basedir, "bin", "ca-bundle.crt", NULL);
const gchar *argv[][7] = {{"curl.exe", uri, "--output", fn, "--cacert", cert, NULL},
{NULL}};
#else
const gchar *argv[][5] = {{"wget", uri, "-O", fn, NULL},
{"curl", uri, "--output", fn, NULL},
{NULL}};
#endif
for (guint i = 0; argv[i][0] != NULL; i++) {
g_autoptr(GError) error_local = NULL;
g_autofree gchar *fn_tmp = NULL;
fn_tmp = fu_common_find_program_in_path(argv[i][0], &error_local);
if (fn_tmp == NULL) {
g_debug("%s", error_local->message);
continue;
}
return fu_common_spawn_sync(argv[i], fu_util_stdout_cb, NULL, 0, NULL, error);
}
g_set_error_literal(error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_FOUND,
"no supported out-of-process downloaders found");
return FALSE;
}
static gchar *
fu_util_download_if_required(FuUtilPrivate *priv, const gchar *perhapsfn, GError **error)
{
g_autofree gchar *filename = NULL;
g_autoptr(GFile) file = NULL;
/* a local file */
if (g_file_test(perhapsfn, G_FILE_TEST_EXISTS))
@ -1167,7 +1141,13 @@ fu_util_download_if_required(FuUtilPrivate *priv, const gchar *perhapsfn, GError
filename = fu_util_get_user_cache_path(perhapsfn);
if (!fu_common_mkdir_parent(filename, error))
return NULL;
if (!fu_util_download_out_of_process(perhapsfn, filename, error))
file = g_file_new_for_path(filename);
if (!fwupd_client_download_file(priv->client,
perhapsfn,
file,
FWUPD_CLIENT_DOWNLOAD_FLAG_NONE,
priv->cancellable,
error))
return NULL;
return g_steal_pointer(&filename);
}
@ -2701,8 +2681,6 @@ static gboolean
fu_util_refresh_remote(FuUtilPrivate *priv, FwupdRemote *remote, GError **error)
{
const gchar *metadata_uri = NULL;
g_autofree gchar *fn_raw = NULL;
g_autofree gchar *fn_sig = NULL;
g_autoptr(GBytes) bytes_raw = NULL;
g_autoptr(GBytes) bytes_sig = NULL;
@ -2716,12 +2694,11 @@ fu_util_refresh_remote(FuUtilPrivate *priv, FwupdRemote *remote, GError **error)
fwupd_remote_get_id(remote));
return FALSE;
}
fn_sig = fu_util_get_user_cache_path(metadata_uri);
if (!fu_common_mkdir_parent(fn_sig, error))
return FALSE;
if (!fu_util_download_out_of_process(metadata_uri, fn_sig, error))
return FALSE;
bytes_sig = fu_common_get_contents_bytes(fn_sig, error);
bytes_sig = fwupd_client_download_bytes(priv->client,
metadata_uri,
FWUPD_CLIENT_DOWNLOAD_FLAG_NONE,
priv->cancellable,
error);
if (bytes_sig == NULL)
return FALSE;
if (!fwupd_remote_load_signature_bytes(remote, bytes_sig, error))
@ -2737,10 +2714,11 @@ fu_util_refresh_remote(FuUtilPrivate *priv, FwupdRemote *remote, GError **error)
fwupd_remote_get_id(remote));
return FALSE;
}
fn_raw = fu_util_get_user_cache_path(metadata_uri);
if (!fu_util_download_out_of_process(metadata_uri, fn_raw, error))
return FALSE;
bytes_raw = fu_common_get_contents_bytes(fn_raw, error);
bytes_raw = fwupd_client_download_bytes(priv->client,
metadata_uri,
FWUPD_CLIENT_DOWNLOAD_FLAG_NONE,
priv->cancellable,
error);
if (bytes_raw == NULL)
return FALSE;
@ -3379,6 +3357,14 @@ main(int argc, char *argv[])
priv->client = fwupd_client_new();
fwupd_client_set_main_context(priv->client, priv->main_ctx);
fwupd_client_set_user_agent_for_package(priv->client, "fwupdtool", PACKAGE_VERSION);
g_signal_connect(FWUPD_CLIENT(priv->client),
"notify::percentage",
G_CALLBACK(fu_util_client_notify_cb),
priv);
g_signal_connect(FWUPD_CLIENT(priv->client),
"notify::status",
G_CALLBACK(fu_util_client_notify_cb),
priv);
/* when not using the engine */
priv->progress = fu_progress_new(G_STRLOC);