mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-06 22:11:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2431 from aleixpol/master

Browse Source 
Don't use the last percentage if the total size changed
This commit is contained in:
Matthias Clasen
2018-12-14 13:35:59 -05:00
committed by GitHub
parent 06019e357d b6eddbccff
commit 041c99d834
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/flatpak-utils.c
View File

@@ -5440,6 +5440,7 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
gboolean last_was_metadata = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (progress), "last-was-metadata"));
FlatpakProgressCallback progress_cb = g_object_get_data (G_OBJECT (progress), "callback");
guint last_progress = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (progress), "last_progress"));
guint last_total = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (progress), "last_total"));
GString *buf;
g_autofree char *status = NULL;
guint outstanding_fetches;
@@ -5451,7 +5452,7 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
guint outstanding_extra_data;
guint64 total_extra_data_bytes;
guint64 transferred_extra_data_bytes;
guint64 total;
guint64 total = 0;
guint metadata_fetched;
guint64 start_time;
guint64 elapsed_time;
@@ -5645,9 +5646,10 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
}
out:
if (new_progress < last_progress)
if (new_progress < last_progress && last_total == total)
new_progress = last_progress;
g_object_set_data (G_OBJECT (progress), "last_progress", GUINT_TO_POINTER (new_progress));
g_object_set_data (G_OBJECT (progress), "last_total", GUINT_TO_POINTER (total));
progress_cb (buf->str, new_progress, estimating, user_data);
@@ -5664,6 +5666,7 @@ flatpak_progress_new (FlatpakProgressCallback progress,
g_object_set_data (G_OBJECT (ostree_progress), "callback", progress);
g_object_set_data (G_OBJECT (ostree_progress), "last_progress", GUINT_TO_POINTER (0));
g_object_set_data (G_OBJECT (ostree_progress), "last_total", GUINT_TO_POINTER (0));
return ostree_progress;
}