#160: fix progressbar values

abbbi · Mar 19, 2024 · 3451ed1 · 3451ed1
1 parent 3f30a3a
commit 3451ed1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,9 @@
+Version 2.1
+---------
+ * Fix Progressbar: Since change for issue #133 the Progressbar was
+ updated with wrong values and as result progressed too fast for the amount of
+ data actually written.
+
 Version 2.0
 ---------
  * Update README

diff --git a/libvirtnbdbackup/backup/disk.py b/libvirtnbdbackup/backup/disk.py
@@ -169,6 +169,8 @@ def backup(  # pylint: disable=too-many-arguments,too-many-branches, too-many-lo
                 if streamType == "raw":
                     size = writer.seek(save.offset)
 
+                progressBar.update(save.length)
+
             if streamType == "stream":
                 writer.write(sTypes.TERM)
                 if args.compress:
@@ -181,8 +183,6 @@ def backup(  # pylint: disable=too-many-arguments,too-many-branches, too-many-lo
                         compressedSizes.append(size)
                 else:
                     assert size == save.length
-
-            progressBar.update(save.length)
         else:
             if streamType == "raw":
                 writer.seek(save.offset)

diff --git a/libvirtnbdbackup/chunk.py b/libvirtnbdbackup/chunk.py
@@ -54,7 +54,7 @@ def write(
         else:
             wSize += writer.write(data)
 
-        pbar.update(wSize)
+        pbar.update(blocklen)
 
     return wSize, cSizes
 

diff --git a/libvirtnbdbackup/common.py b/libvirtnbdbackup/common.py
@@ -224,6 +224,7 @@ def progressBar(total: int, desc: str, args: Namespace, count=0) -> tqdm:
         desc=desc,
         unit="B",
         unit_scale=True,
+        unit_divisor=1000,
         disable=args.noprogress,
         position=count,
         leave=False,