From 07609559b85e45c3acf4132fc56b53db9b014718 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 18 May 2017 15:37:35 +0200 Subject: [PATCH] progress: Don't report ??? in the bar while estimating --- app/flatpak-transaction.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/app/flatpak-transaction.c b/app/flatpak-transaction.c index 3f21ae06f..24ba1a7d1 100644 --- a/app/flatpak-transaction.c +++ b/app/flatpak-transaction.c @@ -680,28 +680,22 @@ progress_cb (const char *status, g_string_append (str, "["); - if (estimating) - { - for (; i < BAR_LENGTH; i++) - g_string_append (str, "?"); - } - else - { - n_full = (BAR_LENGTH * progress) / 100; - remainder = progress - (n_full * 100 / BAR_LENGTH); - partial = (remainder * strlen(BAR_CHARS) * BAR_LENGTH) / 100; + n_full = (BAR_LENGTH * progress) / 100; + remainder = progress - (n_full * 100 / BAR_LENGTH); + partial = (remainder * strlen(BAR_CHARS) * BAR_LENGTH) / 100; - for (i = 0; i < n_full; i++) - g_string_append_c (str, BAR_CHARS[strlen(BAR_CHARS)-1]); - if (i < BAR_LENGTH) - { - g_string_append_c (str, BAR_CHARS[partial]); - i++; - } - for (; i < BAR_LENGTH; i++) - g_string_append (str, " "); + for (i = 0; i < n_full; i++) + g_string_append_c (str, BAR_CHARS[strlen(BAR_CHARS)-1]); + + if (i < BAR_LENGTH) + { + g_string_append_c (str, BAR_CHARS[partial]); + i++; } + for (; i < BAR_LENGTH; i++) + g_string_append (str, " "); + g_string_append (str, "] "); g_string_append (str, status);