From 32d6287d1484cea4ab49915494aa266efd54b66e Mon Sep 17 00:00:00 2001 From: Dylan Gormley Date: Tue, 25 Aug 2026 12:13:21 -0500 Subject: [PATCH] fix: use ASCII status output --- dtcli/clear.py | 4 ++-- dtcli/cli.py | 2 +- dtcli/src/functions.py | 8 ++++---- dtcli/unregistered.py | 4 ++-- dtcli/utilities/cadcclient.py | 2 +- tests/test_cli.py | 2 ++ 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dtcli/clear.py b/dtcli/clear.py index 9614012..8752ca5 100644 --- a/dtcli/clear.py +++ b/dtcli/clear.py @@ -128,9 +128,9 @@ def clear( is_delete = True else: message = ( - "⚠️ Delete files and empty parent directories?" + "WARNING: Delete files and empty parent directories?" if clear_parents - else "⚠️ Delete files?" + else "WARNING: Delete files?" ) is_delete = Confirm.ask(message) diff --git a/dtcli/cli.py b/dtcli/cli.py index c123bfa..d95c158 100644 --- a/dtcli/cli.py +++ b/dtcli/cli.py @@ -60,7 +60,7 @@ def check_version() -> None: current_version = package_version("datatrail-cli") latest_version = utilities.get_latest_released_version() terminal_stderr.print( - f"A new release of datatrail-cli is available: {current_version} → {latest_version}", # noqa: E501 + f"A new release of datatrail-cli is available: {current_version} -> {latest_version}", # noqa: E501 style="bold yellow", ) terminal_stderr.print() diff --git a/dtcli/src/functions.py b/dtcli/src/functions.py index 2804c68..d342e82 100644 --- a/dtcli/src/functions.py +++ b/dtcli/src/functions.py @@ -261,10 +261,10 @@ def find_missing_dataset_files( existing_files = [] for f in file_paths: if Path(root_path + f).exists(): - logger.debug(f"- {f} : ✔") + logger.debug(f"- {f} : present") existing_files.append(f) else: - logger.debug(f"- {f} : ✘") + logger.debug(f"- {f} : missing") missing_files.append(f) else: @@ -374,10 +374,10 @@ def clear_dataset_path( files: List[Path] = [f for f in parent.iterdir()] logger.debug(f"files: {files}") if files: - logger.debug(f"{parent}: ✗") + logger.debug(f"{parent}: failed") clear_parents = False else: - logger.debug(f"{parent}: ✔") + logger.debug(f"{parent}: ok") parent.rmdir() time.sleep(0.1) parent = parent.parent diff --git a/dtcli/unregistered.py b/dtcli/unregistered.py index 19cc12c..6c6b709 100644 --- a/dtcli/unregistered.py +++ b/dtcli/unregistered.py @@ -66,7 +66,7 @@ def summary( total = sum(results.values()) table = Table( - title=f"Summary of reasons — {total:,} unregistered datasets", + title=f"Summary of reasons - {total:,} unregistered datasets", header_style="magenta", title_style="bold magenta", row_styles=["none", "dim"], @@ -94,7 +94,7 @@ def summary( reasons.sort(key=lambda reason: reason[1], reverse=True) for row, (detail, count) in enumerate(reasons): if category in ("ATTACH_MISSING", "CREATE_DUPLICATE"): - detail = detail.replace(":", " → ", 1) + detail = detail.replace(":", " -> ", 1) table.add_row( Text(category, style=style) if row == 0 else "", Text(detail) if detail else "(no reason recorded)", diff --git a/dtcli/utilities/cadcclient.py b/dtcli/utilities/cadcclient.py index 0452787..7c74317 100644 --- a/dtcli/utilities/cadcclient.py +++ b/dtcli/utilities/cadcclient.py @@ -123,7 +123,7 @@ def get( ): with attempt: storage.cadcget(filename, destination[index]) # type: ignore - logger.debug(f"{filename} ➜ {destination[index]} ✔") + logger.debug(f"{filename} -> {destination[index]} ok") except cadcutils.exceptions.NotFoundException as error: # type: ignore logger.error(f"CADC Exception: {filename}") not_found.append(str(error)) diff --git a/tests/test_cli.py b/tests/test_cli.py index 77ddee8..20983d0 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -725,4 +725,6 @@ def test_check_version_banner_on_stderr(monkeypatch, capsys) -> None: cli_module.check_version() captured = capsys.readouterr() assert "A new release of datatrail-cli is available" in captured.err + assert " -> 99.0.0" in captured.err + assert captured.err.isascii() assert "A new release of datatrail-cli is available" not in captured.out