From 9462ddcd7185b0058b37a66dcf2db0cc17ef3b73 Mon Sep 17 00:00:00 2001 From: defigli Date: Tue, 21 May 2024 20:47:21 +0200 Subject: [PATCH 1/2] [feat]: print projects without quotes --- src/controller/list.rs | 8 ++++++-- src/main.rs | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/controller/list.rs b/src/controller/list.rs index dfbd8e4..eeae893 100644 --- a/src/controller/list.rs +++ b/src/controller/list.rs @@ -163,7 +163,7 @@ pub fn check(file_name: &str) -> Result<()> { } // lists all projects -pub fn list_projects(file_name: &str, current: bool) -> Result<()> { +pub fn list_projects(file_name: &str, current: bool, no_quotes: bool) -> Result<()> { let file_content = bartib_file::get_file_content(file_name)?; let mut all_projects: Vec<&String> = getter::get_activities(&file_content) @@ -175,7 +175,11 @@ pub fn list_projects(file_name: &str, current: bool) -> Result<()> { all_projects.dedup(); for project in all_projects { - println!("\"{project}\""); + if no_quotes { + println!("{project}"); + } else { + println!("\"{project}\""); + } } Ok(()) diff --git a/src/main.rs b/src/main.rs index 42ebc2d..7863968 100644 --- a/src/main.rs +++ b/src/main.rs @@ -234,6 +234,14 @@ fn main() -> Result<()> { .help("prints currently running projects only") .takes_value(false) .required(false), + ) + .arg( + Arg::with_name("no-quotes") + .short("n") + .long("no-quotes") + .help("prints projects without quotes") + .takes_value(false) + .required(false), ), ) .subcommand( @@ -335,7 +343,7 @@ fn run_subcommand(matches: &ArgMatches, file_name: &str) -> Result<()> { bartib::controller::report::show_report(file_name, filter, processors) } ("projects", Some(sub_m)) => { - bartib::controller::list::list_projects(file_name, sub_m.is_present("current")) + bartib::controller::list::list_projects(file_name, sub_m.is_present("current"), sub_m.is_present("no-quotes")) } ("last", Some(sub_m)) => { let number = get_number_argument_or_ignore(sub_m.value_of("number"), "-n/--number") From dc990d66a595af2bf0e2866604951be3b0819e2b Mon Sep 17 00:00:00 2001 From: Nikolas Schmidt-Voigt Date: Tue, 21 May 2024 22:00:44 +0200 Subject: [PATCH 2/2] Fixed formatting --- src/main.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 7863968..d4f2a21 100644 --- a/src/main.rs +++ b/src/main.rs @@ -342,9 +342,11 @@ fn run_subcommand(matches: &ArgMatches, file_name: &str) -> Result<()> { let processors = create_processors_for_arguments(sub_m); bartib::controller::report::show_report(file_name, filter, processors) } - ("projects", Some(sub_m)) => { - bartib::controller::list::list_projects(file_name, sub_m.is_present("current"), sub_m.is_present("no-quotes")) - } + ("projects", Some(sub_m)) => bartib::controller::list::list_projects( + file_name, + sub_m.is_present("current"), + sub_m.is_present("no-quotes"), + ), ("last", Some(sub_m)) => { let number = get_number_argument_or_ignore(sub_m.value_of("number"), "-n/--number") .unwrap_or(10);