diff --git a/src/email/message/command/copy.rs b/src/email/message/command/copy.rs index 6ffb2ae..6e74e26 100644 --- a/src/email/message/command/copy.rs +++ b/src/email/message/command/copy.rs @@ -8,7 +8,7 @@ use crate::{ cache::arg::disable::CacheDisableFlag, config::TomlConfig, envelope::arg::ids::EnvelopeIdsArgs, - folder::arg::name::{SourceFolderNameArg, TargetFolderNameArg}, + folder::arg::name::{SourceFolderNameOptionalFlag, TargetFolderNameArg}, printer::Printer, }; @@ -16,7 +16,7 @@ use crate::{ #[derive(Debug, Parser)] pub struct MessageCopyCommand { #[command(flatten)] - pub source_folder: SourceFolderNameArg, + pub source_folder: SourceFolderNameOptionalFlag, #[command(flatten)] pub target_folder: TargetFolderNameArg, diff --git a/src/email/message/command/delete.rs b/src/email/message/command/delete.rs index a5145e7..21797fb 100644 --- a/src/email/message/command/delete.rs +++ b/src/email/message/command/delete.rs @@ -44,6 +44,6 @@ impl MessageDeleteCommand { let ids = &self.envelopes.ids; backend.delete_messages(folder, ids).await?; - printer.print("Message(s) successfully deleted from {from_folder} to {to_folder}!") + printer.print(format!("Message(s) successfully removed from {folder}!")) } } diff --git a/src/email/message/command/move_.rs b/src/email/message/command/move_.rs index 728116a..dc72a71 100644 --- a/src/email/message/command/move_.rs +++ b/src/email/message/command/move_.rs @@ -8,7 +8,7 @@ use crate::{ cache::arg::disable::CacheDisableFlag, config::TomlConfig, envelope::arg::ids::EnvelopeIdsArgs, - folder::arg::name::{SourceFolderNameArg, TargetFolderNameArg}, + folder::arg::name::{SourceFolderNameOptionalFlag, TargetFolderNameArg}, printer::Printer, }; @@ -16,7 +16,7 @@ use crate::{ #[derive(Debug, Parser)] pub struct MessageMoveCommand { #[command(flatten)] - pub source_folder: SourceFolderNameArg, + pub source_folder: SourceFolderNameOptionalFlag, #[command(flatten)] pub target_folder: TargetFolderNameArg, diff --git a/src/folder/arg/name.rs b/src/folder/arg/name.rs index 225c5ac..c978f57 100644 --- a/src/folder/arg/name.rs +++ b/src/folder/arg/name.rs @@ -26,11 +26,12 @@ pub struct FolderNameArg { pub name: String, } -/// The source folder name argument parser. +/// The optional source folder name flag parser. #[derive(Debug, Parser)] -pub struct SourceFolderNameArg { +pub struct SourceFolderNameOptionalFlag { /// The name of the source folder. - #[arg(name = "from-folder-name", value_name = "FROM")] + #[arg(long = "folder", short = 'f')] + #[arg(name = "source_folder_name", value_name = "SOURCE", default_value = INBOX)] pub name: String, } @@ -38,6 +39,6 @@ pub struct SourceFolderNameArg { #[derive(Debug, Parser)] pub struct TargetFolderNameArg { /// The name of the target folder. - #[arg(name = "to-folder-name", value_name = "TO")] + #[arg(name = "target_folder_name", value_name = "TARGET")] pub name: String, }