From 6f96fbac943df49dc2baa50d407550559aaf71a9 Mon Sep 17 00:00:00 2001 From: Jeremiah Russell Date: Thu, 9 Oct 2025 07:11:41 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(cli):=20consolida?= =?UTF-8?q?te=20rules=20and=20labels=20under=20config=20subcommand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - move rules_cli to config_cli - rename rules subcommand to config - simplify cli structure for better user experience --- src/main.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index be8732f..b3e4722 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,19 @@ use clap::{Parser, Subcommand}; +mod config_cli; mod label_cli; mod message_cli; -mod rules_cli; mod trash_cli; use cull_gmail::{Config, Error}; + +use config_cli::ConfigCli; use label_cli::LabelCli; use message_cli::MessageCli; -use rules_cli::RulesCli; -use std::error::Error as stdError; - use trash_cli::TrashCli; +use std::error::Error as stdError; + #[derive(Parser, Debug)] #[clap(author, version, about, long_about = None)] struct Cli { @@ -33,9 +34,9 @@ enum Commands { /// Move messages to trash #[clap(name = "trash")] Trash(TrashCli), - /// Configure end-of-life rules - #[clap(name = "rules")] - Rules(RulesCli), + /// Configure rules and labels + #[clap(name = "config")] + Config(ConfigCli), } #[tokio::main] @@ -69,7 +70,7 @@ async fn run(args: Cli) -> Result<(), Error> { Commands::Message(list_cli) => list_cli.run(config.credential_file()).await?, Commands::Labels(label_cli) => label_cli.run(config.credential_file()).await?, Commands::Trash(trash_cli) => trash_cli.run(config.credential_file()).await?, - Commands::Rules(config_cli) => config_cli.run(config)?, + Commands::Config(config_cli) => config_cli.run(config)?, } } Ok(())