From 6bedab0d88003d9f8fe02be94042808d50f134b2 Mon Sep 17 00:00:00 2001
From: KD <kundeng00@pm.me>
Date: Fri, 24 Oct 2025 20:51:33 -0400
Subject: [PATCH] tsk-82: Refactor validate_args() method (#90)

* tsk-82: Refactored validate_flags() method

* tsk-82: Warning fix

* tsk-82: Code formatting

* tsk-82: Version bump

* tsk-82: Forgot this

* tsk-82: Fix
---
 Cargo.lock                      |  2 +-
 Cargo.toml                      |  2 +-
 src/managers/action_managers.rs | 16 ++++++++--------
 src/managers/commit_manager.rs  |  2 +-
 4 files changed, 11 insertions(+), 11 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"
 
diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs
index 6de2411..cf442e2 100644
--- a/src/managers/action_managers.rs
+++ b/src/managers/action_managers.rs
@@ -68,17 +68,17 @@ impl ActionManager {
 
         while i < flag_vals.len() {
             let flag = &flag_vals[i];
-
             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.is_valid_flag(flag) {
+                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);
             }
diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs
index 4e3decb..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, Write};
+use std::io::Result;
 use std::str::FromStr;
 
 use crate::managers;