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

trivial: Display a more natural string for the time remaining

Browse Source 
We can't pretend we're accurate to 10m in the precision of the float when we're
doing things like USB re-enumeration which can take several seconds. I believe
users want some indication of 'should I wait or go do something else' rather
than any precise timings.
This commit is contained in:
Richard Hughes 2018-08-31 08:27:04 +01:00
parent c0dd011eaf
commit c0c6712fcc
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/fu-progressbar.c
View File

@ -116,6 +116,26 @@ fu_progressbar_estimate_ready (FuProgressbar *self, guint percentage)
return old > self->last_estimate; return old > self->last_estimate;
} }
static gchar *
fu_progressbar_time_remaining_str (FuProgressbar *self)
{
/* less than 5 seconds remaining */
if (self->last_estimate < 5)
return NULL;
/* less than 60 seconds remaining */
if (self->last_estimate < 60) {
/* TRANSLATORS: time remaining for completing firmware flash */
return g_strdup (_("Less than one minute remaining"));
}
/* more than a minute */
return g_strdup_printf (ngettext ("%.0f minute remaining",
"%.0f minutes remaining",
self->last_estimate / 60),
self->last_estimate / 60);
}
static void static void
fu_progressbar_refresh (FuProgressbar *self, FwupdStatus status, guint percentage) fu_progressbar_refresh (FuProgressbar *self, FwupdStatus status, guint percentage)
{ {
@ -157,12 +177,9 @@ fu_progressbar_refresh (FuProgressbar *self, FwupdStatus status, guint percentag
/* once we have good data show an estimate of time remaining */ /* once we have good data show an estimate of time remaining */
if (fu_progressbar_estimate_ready (self, percentage)) { if (fu_progressbar_estimate_ready (self, percentage)) {
g_autofree gchar *remaining = g_strdup_printf ("%.2f", self->last_estimate); g_autofree gchar *remaining = fu_progressbar_time_remaining_str (self);
g_string_append_c (str, ' '); if (remaining != NULL)
/* TRANSLATORS: time remaining for completing firmware flash */ g_string_append_printf (str, " %s", remaining);
g_string_append (str, _("Estimated time remaining:"));
g_string_append_c (str, ' ');
g_string_append (str, remaining);
} }
/* dump to screen */ /* dump to screen */