From 251663c482aef48c3f909a611e0388f34eb15ba0 Mon Sep 17 00:00:00 2001
From: naglepuff <mike.nagler@kitware.com>
Date: Thu, 2 May 2024 18:16:14 -0400
Subject: [PATCH 1/2] Progress bar improvements

---
 imagedephi/redact/redact.py | 13 ++++++-------
 pyproject.toml              |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/imagedephi/redact/redact.py b/imagedephi/redact/redact.py
index b52eea7a..58a109ab 100644
--- a/imagedephi/redact/redact.py
+++ b/imagedephi/redact/redact.py
@@ -9,6 +9,8 @@
 import click
 import tifftools
 import tifftools.constants
+from tqdm import tqdm
+from tqdm.contrib.logging import logging_redirect_tqdm
 import yaml
 
 from imagedephi.rules import Ruleset
@@ -88,13 +90,9 @@ def redact_images(
     output_file_counter = 1
     output_file_max = len(images_to_redact)
     redact_dir = create_redact_dir(output_dir)
-    show_redaction_plan(input_path)
 
-    file = StringIO()
-    with click.progressbar(
-        images_to_redact, label="Redacting Images", show_pos=True, file=file, show_percent=True
-    ) as bar:
-        for image_file in bar:
+    with logging_redirect_tqdm(loggers=[logger]):
+        for image_file in tqdm(images_to_redact, desc="Redacting images", position=0, leave=True):
             push_progress(output_file_counter, output_file_max)
             try:
                 redaction_plan = build_redaction_plan(image_file, base_rules, override_rules)
@@ -106,6 +104,7 @@ def redact_images(
                 logger.info(f"Redaction could not be performed for {image_file.name}.")
                 redaction_plan.report_missing_rules()
             else:
+                redaction_plan.report_plan()
                 redaction_plan.execute_plan()
                 output_parent_dir = redact_dir
                 if recursive:
@@ -126,7 +125,7 @@ def redact_images(
                 )
                 redaction_plan.save(output_path, overwrite)
                 if output_file_counter == output_file_max:
-                    click.echo("Redactions completed")
+                    logger.info("Redactions completed")
             output_file_counter += 1
 
 
diff --git a/pyproject.toml b/pyproject.toml
index fb840bb4..f48e6ee5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,6 +14,7 @@ dependencies = [
     "pyyaml",
     "Pillow",
     "pydicom",
+    "tqdm",
     "wsidicom",
     "websockets",
 ]

From 5cc1805d1705abb2672d59b0d338db0e1745e692 Mon Sep 17 00:00:00 2001
From: naglepuff <mike.nagler@kitware.com>
Date: Tue, 7 May 2024 13:20:26 -0400
Subject: [PATCH 2/2] Remove unused imports

---
 imagedephi/redact/redact.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/imagedephi/redact/redact.py b/imagedephi/redact/redact.py
index 58a109ab..f429b946 100644
--- a/imagedephi/redact/redact.py
+++ b/imagedephi/redact/redact.py
@@ -3,10 +3,8 @@
 from collections.abc import Generator
 import datetime
 import importlib.resources
-from io import StringIO
 from pathlib import Path
 
-import click
 import tifftools
 import tifftools.constants
 from tqdm import tqdm