From 11f9f4fc5ed2eefc441bc6d8862bfd68db82fb8e Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 22 Oct 2025 21:18:32 -0400 Subject: [PATCH 1/5] tsk-77: Added code to print version --- src/main.rs | 7 +++++++ src/managers/action_managers.rs | 21 +++++++++++---------- src/version.rs | 6 ++++++ 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 src/version.rs diff --git a/src/main.rs b/src/main.rs index 46dfc9b..ecfe692 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,6 +4,7 @@ mod models; mod parsers; mod syncers; mod utilities; +mod version; use std::env; @@ -24,6 +25,12 @@ async fn main() { act_mgr.initialize(); let chosen_act = act_mgr.retrieve_icarus_action(); + for act in &chosen_act.flags { + if act.flag == "-v" { + version::print_version(); + utilities::checks::exit_program(-1); + } + } chosen_act.print_action_and_flags(); let mut cmt_mgr = managers::commit_manager::CommitManager { diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index 680981c..e1eae3c 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -48,6 +48,7 @@ impl ActionManager { String::from("-ca"), String::from("-smca"), String::from("-t"), + String::from("-v") ] } @@ -63,31 +64,24 @@ impl ActionManager { } fn validate_flags(&mut self) { - println!("Validating flags"); - let flag_vals = self.parsed_flags(); let mut i = 0; - println!("Flag count: {}", flag_vals.len()); while i < flag_vals.len() { let flag = &flag_vals[i]; - println!("Index: {i} | Value: {flag}"); let mut flg = models::flags::Flags::default(); // TODO: Refactor this if self.is_valid_flag(flag) && self.does_flag_have_value(flag) { - println!("Flag has value"); flg.flag = String::from(flag); flg.value = String::from(&flag_vals[i + 1]); i += 1; } else if self.is_valid_flag(flag) { - println!("Flag does not have a value"); flg.flag = String::from(flag); } else { - println!("Flag {flag} is not valid"); utilities::checks::exit_program(-1); } @@ -155,9 +149,16 @@ impl ActionManager { fn parsed_flags(&self) -> Vec { let mut parsed: Vec = Vec::new(); - for i in 2..self.params.len() { - let flag = String::from(&self.params[i]); - parsed.push(flag); + if self.param_count <= 2 { + let flag = String::from(&self.params[1]); + if flag == "-v" { + parsed.push(flag); + } + } else { + for i in 2..self.params.len() { + let flag = String::from(&self.params[i]); + parsed.push(flag); + } } parsed diff --git a/src/version.rs b/src/version.rs new file mode 100644 index 0000000..10eaa46 --- /dev/null +++ b/src/version.rs @@ -0,0 +1,6 @@ +pub fn print_version() { + let name = env!("CARGO_PKG_NAME"); + let version = env!("CARGO_PKG_VERSION"); + + println!("{name:?} {version:?}"); +} -- 2.47.3 From 7f6dafbe0a8b033f3b9f0fc8079841ae05948d54 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 22 Oct 2025 21:20:47 -0400 Subject: [PATCH 2/5] tsk-77: Removed print statement --- src/main.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index ecfe692..5eab171 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,8 +18,6 @@ async fn main() { utilities::checks::exit_program(-1); } - println!("Argument count: {args_len}"); - let mut act_mgr = managers::action_managers::ActionManager::default(); act_mgr.set_params(&args); act_mgr.initialize(); -- 2.47.3 From 3805cb36aac7d6869d11780dafb8f29e92c819ab Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 22 Oct 2025 21:21:33 -0400 Subject: [PATCH 3/5] tsk-77: Code formatting --- src/managers/action_managers.rs | 2 +- src/version.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index e1eae3c..2718401 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -48,7 +48,7 @@ impl ActionManager { String::from("-ca"), String::from("-smca"), String::from("-t"), - String::from("-v") + String::from("-v"), ] } diff --git a/src/version.rs b/src/version.rs index 10eaa46..1f1bfae 100644 --- a/src/version.rs +++ b/src/version.rs @@ -1,6 +1,6 @@ pub fn print_version() { - let name = env!("CARGO_PKG_NAME"); - let version = env!("CARGO_PKG_VERSION"); + let name = env!("CARGO_PKG_NAME"); + let version = env!("CARGO_PKG_VERSION"); - println!("{name:?} {version:?}"); + println!("{name:?} {version:?}"); } -- 2.47.3 From c7ead4523eb5271315736a471796c5c2499f093b Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 22 Oct 2025 21:22:17 -0400 Subject: [PATCH 4/5] tsk-77: Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8a5955..b597e9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.8.3" +version = "0.8.4" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index 54ebd09..5bfc724 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.8.3" +version = "0.8.4" rust-version = "1.90" edition = "2024" -- 2.47.3 From 75a000ec550602158d9e8a87969013b3ed0d1258 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 22 Oct 2025 21:26:08 -0400 Subject: [PATCH 5/5] tsk-77: Updated help --- src/help.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/help.rs b/src/help.rs index fb6d2ce..b9b34f5 100644 --- a/src/help.rs +++ b/src/help.rs @@ -30,7 +30,10 @@ pub fn print_help() { -rt retrieve type (songs is only accepted) Required for deleting a song - -D song id"#, + -D song id + + Print version + -v"#, ); println!("{msg}"); -- 2.47.3