From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Aug 2022 19:53:48 +0000 (+0000)
Subject: snapshot: Show extraction speed again
X-Git-Tag: 0.9.28~463
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95a232a7708441a2f43f265c12f8a69a93aa5c57;p=pakfire.git

snapshot: Show extraction speed again

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/compress.c b/src/libpakfire/compress.c
index 3da28eab3..0ed35fb4f 100644
--- a/src/libpakfire/compress.c
+++ b/src/libpakfire/compress.c
@@ -556,6 +556,13 @@ static int pakfire_extract_progressbar_create(struct pakfire_progressbar** progr
 	if (r)
 		return r;
 
+	// Add throughput
+	if (flags & PAKFIRE_EXTRACT_SHOW_THROUGHPUT) {
+		r = pakfire_progressbar_add_transfer_speed(*progressbar);
+		if (r)
+			return r;
+	}
+
 	// Add percentage
 	r = pakfire_progressbar_add_percentage(*progressbar);
 	if (r)
diff --git a/src/libpakfire/include/pakfire/compress.h b/src/libpakfire/include/pakfire/compress.h
index eef3fa219..1bb24679e 100644
--- a/src/libpakfire/include/pakfire/compress.h
+++ b/src/libpakfire/include/pakfire/compress.h
@@ -37,6 +37,10 @@ FILE* pakfire_xzfopen(FILE* f, const char* mode);
 FILE* pakfire_zstdfopen(FILE* f, const char* mode);
 
 // Extract
+enum pakfire_extract_flags {
+	PAKFIRE_EXTRACT_SHOW_THROUGHPUT = (1 << 0),
+};
+
 int pakfire_extract(struct pakfire* pakfire, struct archive* archive,
 	size_t size, const char* prefix, const char* message, int flags);
 
diff --git a/src/libpakfire/snapshot.c b/src/libpakfire/snapshot.c
index 13fd4e4bc..2a66d71c7 100644
--- a/src/libpakfire/snapshot.c
+++ b/src/libpakfire/snapshot.c
@@ -232,7 +232,8 @@ static int pakfire_snapshot_extract(struct pakfire* pakfire, const char* path) {
 	}
 
 	// Extract snapshot
-	r = pakfire_extract(pakfire, archive, st.st_size, NULL, _("Extracting snapshot..."), 0);
+	r = pakfire_extract(pakfire, archive, st.st_size, NULL,
+			_("Extracting snapshot..."), PAKFIRE_EXTRACT_SHOW_THROUGHPUT);
 	if (r)
 		goto ERROR;