From 73eb4cd08cad3ce6c7cb6ba46c705ecee6d59930 Mon Sep 17 00:00:00 2001
From: WillyPillow <wp@nerde.pw>
Date: Sat, 11 Jul 2020 21:42:58 +0800
Subject: [PATCH] Use tqdm for progress bar.

---
 qubesadmin/tools/.qvm_template.py.swp | Bin 0 -> 16384 bytes
 qubesadmin/tools/qvm_template.py      |  28 +++++++++-----------------
 2 files changed, 9 insertions(+), 19 deletions(-)
 create mode 100644 qubesadmin/tools/.qvm_template.py.swp

diff --git a/qubesadmin/tools/.qvm_template.py.swp b/qubesadmin/tools/.qvm_template.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..9d3f470910e469595b12829c9ab4303f12b4e74b
GIT binary patch
literal 16384
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
W#i`aJN}-ZBqyC_K5~<5jwf+s<Q{aUF

literal 0
HcmV?d00001

diff --git a/qubesadmin/tools/qvm_template.py b/qubesadmin/tools/qvm_template.py
index bcb4d1b..abdf937 100644
--- a/qubesadmin/tools/qvm_template.py
+++ b/qubesadmin/tools/qvm_template.py
@@ -15,6 +15,7 @@ import dnf
 import qubesadmin
 import qubesadmin.tools
 import rpm
+import tqdm
 import xdg.BaseDirectory
 
 PATH_PREFIX = '/var/lib/qubes/vm-templates'
@@ -249,25 +250,14 @@ def qrexec_download(args, app, spec, path, dlsize=None):
         payload = qrexec_payload(args, app, spec)
         proc.stdin.write(payload.encode('UTF-8'))
         proc.stdin.close()
-        while proc.poll() == None:
-            width = shutil.get_terminal_size((80, 20)).columns
-            pct = '%5.f%% ' % math.floor(f.tell() / dlsize * 100)
-            bar_len = width - len(pct) - 2
-            num_hash = math.floor(f.tell() / dlsize * bar_len)
-            num_space = bar_len - num_hash
-            # Clear previous bar
-            print(u'\u001b[1000D', end='', file=sys.stderr)
-            print(pct + '[' + ('#' * num_hash) + (' ' * num_space) + ']',
-                end='', file=sys.stderr)
-            sys.stderr.flush()
-            time.sleep(0.1)
-        #while True:
-        #    c = proc.stderr.read(1)
-        #    if not c:
-        #        break
-        #    # Write raw byte w/o decoding
-        #    sys.stdout.buffer.write(c)
-        #    sys.stdout.flush()
+        with tqdm.tqdm(desc=spec, total=dlsize, unit_scale=True,
+                unit_divisor=1000, unit='B') as pbar:
+            last = 0
+            while proc.poll() == None:
+                cur = f.tell()
+                pbar.update(cur - last)
+                last = cur
+                time.sleep(0.1)
         if proc.wait() != 0:
             return False
         return True