Merge pull request #103 from ImageMarkup/fix-progress-message

Clean up the progress message

Author: danlamanna

isic_cli/cli/image.py

@@ -145,15 +145,11 @@ def signal_handler(signum, frame):
 
     with Progress(console=Console(file=sys.stderr)) as progress:
         if limit == 0:
-            task = progress.add_task(
-                f"Downloading images ({nice_num_images} files, {nice_total_size})",
-                total=download_num_images,
-            )
+            message = f"Downloading images + metadata ({nice_num_images} files, {nice_total_size})"
         else:
-            task = progress.add_task(
-                f"Downloading images (and metadata) ({nice_num_images} total)",
-                total=download_num_images,
-            )
+            message = f"Downloading images + metadata ({nice_num_images} files)"
+
+        task = progress.add_task(message, total=download_num_images)
 
         images_iterator = itertools.islice(
             get_images(ctx.session, search, collections), download_num_images

tests/test_cli_image.py

@@ -95,7 +95,7 @@ def test_image_download_no_size_info_with_limit(cli_run, outdir):
     result = cli_run(["image", "download", outdir, "--limit", "1"])
     assert result.exit_code == 0
     assert "2.0 MB" not in result.output
-    assert "1 total" in result.output
+    assert "1 files" in result.output
 
 
 @pytest.mark.usefixtures("_isolated_filesystem", "_mock_images")