From c17375ec2ee2042c5523f86130a73b2dcb48db61 Mon Sep 17 00:00:00 2001
From: Red S <redstreet@users.noreply.github.com>
Date: Sat, 11 Jun 2022 19:45:21 -0700
Subject: [PATCH] feat(util): bean-download: display download progress bars;
 pretty output

---
 .../util/bean_download.py                     | 27 ++++++++++++++-----
 requirements.txt                              |  6 +++++
 setup.py                                      |  2 ++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/beancount_reds_importers/util/bean_download.py b/beancount_reds_importers/util/bean_download.py
index 3a6f251..0196de0 100755
--- a/beancount_reds_importers/util/bean_download.py
+++ b/beancount_reds_importers/util/bean_download.py
@@ -7,6 +7,8 @@
 import os
 import configparser
 import asyncio
+import tabulate
+import tqdm
 
 
 @click.group(cls=ClickAliasedGroup)
@@ -87,21 +89,27 @@ def download(config_file, sites, site_type, dry_run, verbose):
     errors = []
     success = []
     numsites = len(sites)
-    print(f"{numsites} to process.")
+    displays = []
+    print(f"Processing {numsites} institutions.")
 
     async def download_site(i, site):
         tid = f'[{i+1}/{numsites} {site}]'
-        print(f'{tid}: Begin')
+        if verbose:
+            print(f'{tid}: Begin')
         options = config[site]
         # We support cmd and display, and type to filter
         if 'display' in options:
-            print(f"{tid}: {options['display']}")
+            displays.append([site, f"{options['display']}"])
+            # print(f"{tid}: {options['display']}")
         if 'cmd' in options:
             cmd = os.path.expandvars(options['cmd'])
             if verbose:
                 print(f"{tid}: Executing: {cmd}")
             if dry_run:
                 await asyncio.sleep(2)
+                success.append(site)
+                if verbose:
+                    print(f"{tid}: Success")
             else:
                 # https://docs.python.org/3.8/library/asyncio-subprocess.html#asyncio.create_subprocess_exec
                 proc = await asyncio.create_subprocess_shell(
@@ -114,20 +122,27 @@ async def download_site(i, site):
                     errors.append(site)
                 else:
                     success.append(site)
-                    print(f"{tid}: Success")
+                    if verbose:
+                        print(f"{tid}: Success")
 
     async def perform_downloads(sites):
         tasks = [download_site(i, site) for i, site in enumerate(sites)]
-        await asyncio.gather(*tasks)
+        for t in tqdm.tqdm(asyncio.as_completed(tasks), total=len(tasks)):
+            await t
 
     asyncio.run(perform_downloads(sites))
 
+    print()
+    displays = [[i + 1, *row] for i, row in enumerate(displays)]
+    print(tabulate.tabulate(displays, headers=["#", "Institution", "Instructions"], tablefmt="plain"))
+    print()
+
     if errors:
         print(f"Successful sites: {success}.")
         print()
         print(f"Unsuccessful sites: {errors}.")
     else:
-        print(f"{len(success)} Downloads successful:", ','.join(success))
+        print(f"{len(success)} downloads successful:", ','.join(success))
 
 
 @cli.command(aliases=['init'])
diff --git a/requirements.txt b/requirements.txt
index ac6ca0e..5f2f847 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -60,3 +60,9 @@ petl == 1.7.4
 # beancount_reds_importers/.eggs/setuptools_scm-6.4.2-py3.8.egg/setuptools_scm/integration.py: 4
 # beancount_reds_importers/setup.py: 2
 setuptools == 45.2.0
+
+# beancount_reds_importers/beancount_reds_importers/util/bean_download.py: 10
+tabulate == 0.8.9
+
+# beancount_reds_importers/beancount_reds_importers/util/bean_download.py: 11
+tqdm == 4.64.0
diff --git a/setup.py b/setup.py
index d84bd71..228a9aa 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,8 @@
         'openpyxl >= 3.0.9',
         'packaging >= 20.3',
         'petl >= 1.7.4',
+        'tabulate >= 0.8.9',
+        'tqdm >= 4.64.0',
     ],
     entry_points={
         'console_scripts': [