From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Oct 2023 10:56:29 +0000 (+0000)
Subject: python: hub: Use an external progressbar module
X-Git-Tag: 0.9.30~1587
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=364b70401cc5bcdbc559ca9c853ae8ec4370a2cf;p=pakfire.git

python: hub: Use an external progressbar module

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

diff --git a/configure.ac b/configure.ac
index 7b2fb9cc8..deba56ced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,7 @@ AM_PATH_PYTHON([3.6])
 
 AX_PYTHON_MODULE([cpuinfo], [fatal])
 AX_PYTHON_MODULE([kerberos], [fatal])
+AX_PYTHON_MODULE([progressbar2], [fatal])
 AX_PYTHON_MODULE([psutil], [fatal])
 AX_PYTHON_MODULE([setproctitle], [fatal])
 AX_PYTHON_MODULE([systemd], [fatal])
diff --git a/src/pakfire/hub.py b/src/pakfire/hub.py
index 6df4c9ac6..92c5979cb 100644
--- a/src/pakfire/hub.py
+++ b/src/pakfire/hub.py
@@ -27,6 +27,7 @@ import json
 import kerberos
 import logging
 import os.path
+import progressbar2 as progressbar
 import psutil
 import subprocess
 import tempfile
@@ -327,14 +328,17 @@ class Hub(object):
 
 		# Make progressbar
 		if show_progress:
-			p = _pakfire.Progressbar()
-			p.add_string(_("Uploading %s") % filename)
-			p.add_percentage()
-			p.add_bar()
-			p.add_transfer_speed()
-			p.add_string("|")
-			p.add_bytes_transferred()
-			p.add_eta()
+			p = progressbar.ProgressBar(
+				max_value=size,
+				widgets=[
+					progressbar.FormatCustomText(_("Uploading %s") % filename),
+					progressbar.Percentage(),
+					progressbar.Bar(),
+					progressbar.FileTransferSpeed(),
+					progressbar.DataSize(),
+					progressbar.AdaptiveETA(),
+				],
+			)
 		else:
 			p = None
 
@@ -395,10 +399,6 @@ class Hub(object):
 
 	@staticmethod
 	def _stream_file(path, size, p, write):
-		# Start the progressbar
-		if p:
-			p.start(size)
-
 		try:
 			with open(path, "rb") as f:
 				while True: