From 426e248244e7100d1ed2cee3ff65dd67feff1932 Mon Sep 17 00:00:00 2001 From: mienpham04 Date: Mon, 7 Oct 2024 12:19:34 -0400 Subject: [PATCH] Optimize color palette in CLI --- twinTrim/flags.py | 16 +++++++++------- twinTrim/utils.py | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/twinTrim/flags.py b/twinTrim/flags.py index 1d8fce6..f8e6f91 100644 --- a/twinTrim/flags.py +++ b/twinTrim/flags.py @@ -38,11 +38,11 @@ def cli(directory, all, min_size, max_size, file_type, exclude, label_color, bar time_taken = end_time - start_time if not duplicates: - click.echo(click.style("No duplicate files found.", fg='green')) + click.secho("No duplicate files found.", bold=True, bg='green') click.echo(click.style(f"Time taken: {time_taken:.2f} seconds.", fg='green')) return - click.echo(click.style(f"Found {len(duplicates)} sets of duplicate files:", fg='yellow')) + click.echo(click.style(f"Found {len(duplicates)} sets of duplicate files:",bold=True, bg='green')) duplicates_dict = defaultdict(list) for original, duplicate in duplicates: @@ -50,16 +50,18 @@ def cli(directory, all, min_size, max_size, file_type, exclude, label_color, bar # Process each set of duplicates for original, duplicates_list in duplicates_dict.items(): - click.echo(click.style(f"Original file: \"{original}\"", fg='cyan')) - click.echo(click.style(f"Number of duplicate files found: {len(duplicates_list)}", fg='cyan')) - click.echo(click.style("They are:", fg='cyan')) + click.echo(click.style("Original file", fg='cyan', bold=True) + ": " + click.style(f"\"{original}\"")) + click.echo(click.style("Number of duplicate files found", fg='cyan', bold=True) + ": " + click.style(f"{len(duplicates_list)}")) + click.echo(click.style("They are", fg='yellow', bold=True) + ":") file_options = [f"{idx + 1}) {duplicate}" for idx, duplicate in enumerate(duplicates_list)] # Prompt user to select which files to delete selected_indices = select_multiple( file_options, # List of files to choose from ticked_indices=[], # Default indices that are selected - maximal_count=len(file_options) + maximal_count=len(file_options), + tick_style='green', + cursor_style='green' ) # Convert the indices back to the original file paths @@ -69,4 +71,4 @@ def cli(directory, all, min_size, max_size, file_type, exclude, label_color, bar handle_and_remove(file_path) click.echo(click.style("Selected duplicate files removed!", fg='green')) - click.echo(click.style(f"Time taken: {time_taken:.2f} seconds.", fg='green')) + click.echo(click.style(f"Time taken: {time_taken:.2f} seconds.", bg='green')) diff --git a/twinTrim/utils.py b/twinTrim/utils.py index a97e18f..6210117 100644 --- a/twinTrim/utils.py +++ b/twinTrim/utils.py @@ -8,7 +8,7 @@ def handle_and_remove(filepath): try: os.remove(filepath) - click.echo(click.style(f"Deleted: {filepath}", fg='green')) + click.echo(click.style(f"Deleted: {filepath}")) except FileNotFoundError: click.echo(click.style(f"File not found (skipped): {filepath}", fg='red')) except PermissionError: @@ -38,4 +38,4 @@ def parse_size(size_str): return int(size_str) # This can also be modified to handle sizes without suffix except ValueError: # If conversion fails, return 0 for invalid formats - return 0 + return 0 \ No newline at end of file