From 6760aa1ab8013639fa96c0a3fbf3573ce0357251 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 20:31:29 -0400 Subject: [PATCH 1/6] tsk-82: Refactored validate_flags() method --- src/managers/action_managers.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index 6de2411..1a656fa 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -66,19 +66,18 @@ impl ActionManager { let mut i = 0; - while i < flag_vals.len() { - let flag = &flag_vals[i]; - + for flag in &flag_vals { let mut flg = models::flags::Flags::default(); - // TODO: Refactor this if self.is_valid_flag(flag) && self.does_flag_have_value(flag) { - flg.flag = String::from(flag); - flg.value = String::from(&flag_vals[i + 1]); + if self.does_flag_have_value(flag) { + flg.flag = String::from(flag); + flg.value = String::from(&flag_vals[i + 1]); - i += 1; - } else if self.is_valid_flag(flag) { - flg.flag = String::from(flag); + i += 1; + } else { + flg.flag = String::from(flag); + } } else { utilities::checks::exit_program(-1); } -- 2.47.3 From 598dfa1c1bfb702c6e73ba0075ca19b27ac622d3 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 20:32:21 -0400 Subject: [PATCH 2/6] tsk-82: Warning fix --- src/managers/commit_manager.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 4e3decb..65253c1 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use std::default::Default; use std::fs::read_dir; -use std::io::{Result, Write}; +use std::io::{Result}; use std::str::FromStr; use crate::managers; -- 2.47.3 From e2f416c77bf45db560f338d7d7deb848b6202069 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 20:32:40 -0400 Subject: [PATCH 3/6] tsk-82: Code formatting --- src/managers/commit_manager.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 65253c1..7a5eba3 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use std::default::Default; use std::fs::read_dir; -use std::io::{Result}; +use std::io::Result; use std::str::FromStr; use crate::managers; -- 2.47.3 From 52bd478fc7e5daf7df96e7a1e01336bebb36ae09 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 20:33:18 -0400 Subject: [PATCH 4/6] tsk-82: Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d5e77e..f9f0425 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.8.7" +version = "0.8.8" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index 546106e..2a8fc76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.8.7" +version = "0.8.8" rust-version = "1.90" edition = "2024" -- 2.47.3 From d4ef3e26d665260800e85ddd52e63a48b1c854a7 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 20:38:29 -0400 Subject: [PATCH 5/6] tsk-82: Forgot this --- src/managers/action_managers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index 1a656fa..ebb4ca1 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -69,7 +69,7 @@ impl ActionManager { for flag in &flag_vals { let mut flg = models::flags::Flags::default(); - if self.is_valid_flag(flag) && self.does_flag_have_value(flag) { + if self.is_valid_flag(flag) { if self.does_flag_have_value(flag) { flg.flag = String::from(flag); flg.value = String::from(&flag_vals[i + 1]); -- 2.47.3 From fff24274385a4862673311d3b08123342a154cf3 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 20:46:27 -0400 Subject: [PATCH 6/6] tsk-82: Fix --- src/managers/action_managers.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index ebb4ca1..cf442e2 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -66,7 +66,8 @@ impl ActionManager { let mut i = 0; - for flag in &flag_vals { + while i < flag_vals.len() { + let flag = &flag_vals[i]; let mut flg = models::flags::Flags::default(); if self.is_valid_flag(flag) { -- 2.47.3