From 3fcfd94ac1353cfd8fb99876b667b58991f184ac Mon Sep 17 00:00:00 2001 From: teesh3rt Date: Thu, 20 Mar 2025 22:10:42 +0200 Subject: [PATCH] feat: add a new argparser to minimize jank --- .gitignore | 2 +- utils/Cargo.lock | 237 ------------------------------------------ utils/src/args.rs | 83 +++++++++++++++ utils/src/commands.rs | 15 ++- utils/src/lib.rs | 1 + utils/src/registry.rs | 32 ++++++ 6 files changed, 129 insertions(+), 241 deletions(-) create mode 100644 utils/src/args.rs diff --git a/.gitignore b/.gitignore index ea8c4bf..eb5a316 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/target +target diff --git a/utils/Cargo.lock b/utils/Cargo.lock index b03bfbd..3a4e2b2 100644 --- a/utils/Cargo.lock +++ b/utils/Cargo.lock @@ -2,243 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" -dependencies = [ - "anstyle", - "once_cell", - "windows-sys", -] - [[package]] name = "boxutils" version = "0.1.0" -dependencies = [ - "clap", -] - -[[package]] -name = "clap" -version = "4.5.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "once_cell" -version = "1.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" - -[[package]] -name = "proc-macro2" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/utils/src/args.rs b/utils/src/args.rs new file mode 100644 index 0000000..98d0cbb --- /dev/null +++ b/utils/src/args.rs @@ -0,0 +1,83 @@ +use super::commands::get_args; + +pub struct Args { + args: Vec, +} + +impl Args { + pub fn new(command: &str, args: Vec) -> Args { + let args = get_args(command.into(), args); + + Args { args } + } + + pub fn get_flag(&self, flag: &str) -> bool { + self.args + .iter() + .any(|arg| arg == flag || arg.starts_with(flag)) + } + + pub fn get_args(&self) -> Vec { + self.args.clone() + } + + pub fn get_option(&self, option: &str) -> Option { + // Check for the option as a separate argument + if let Some(i) = self.args.iter().position(|x| x == option) { + if i + 1 < self.args.len() { + return Some(self.args[i + 1].clone()); + } + } + + // Check for the option as a combined argument (-fvalue) + for arg in &self.args { + if arg.starts_with(option) && arg.len() > option.len() { + return Some(arg[option.len()..].to_string()); + } + } + + None + } +} + +mod tests { + #[test] + fn test_flag() { + let args = super::Args::new("sometool", vec!["sometool".into(), "-f".into()]); + assert_eq!(args.get_flag("-f"), true); + } + + #[test] + fn test_no_flag() { + let args = super::Args::new("sometool", vec!["sometool".into(), "-f".into()]); + assert_eq!(args.get_flag("-g"), false); + } + + #[test] + fn test_option() { + let args = super::Args::new("sometool", vec![ + "sometool".into(), + "-f".into(), + "value".into(), + ]); + assert_eq!(args.get_option("-f"), Some("value".into())); + } + + #[test] + fn test_no_option() { + let args = super::Args::new("sometool", vec!["sometool".into(), "-f".into()]); + assert_eq!(args.get_option("-g"), None); + } + + #[test] + fn test_combined_option() { + let args = super::Args::new("sometool", vec!["sometool".into(), "-fvalue".into()]); + assert_eq!(args.get_option("-f"), Some("value".into())); + } + + #[test] + fn test_args() { + let args = super::Args::new("sometool", vec!["sometool".into(), "-f".into()]); + assert_eq!(args.get_args(), vec!["-f".to_string()]); + } +} diff --git a/utils/src/commands.rs b/utils/src/commands.rs index 0ebed45..5d3ad17 100644 --- a/utils/src/commands.rs +++ b/utils/src/commands.rs @@ -12,14 +12,23 @@ pub fn being_called_as() -> String { } pub fn get_args(commandname: String, args: Vec) -> Vec { - let mut arguments: Vec = args.clone(); + let mut arguments = args.clone(); + + if arguments.is_empty() { + return arguments; // Prevent out-of-bounds errors + } + let exe_name = being_called_as(); - let _ = mem::replace(&mut arguments[0], exe_name); + // Replace only if it's actually the executable name + if arguments[0] != commandname { + let _ = mem::replace(&mut arguments[0], exe_name); + } + // Trim arguments if commandname is found if let Some(num) = arguments.iter().position(|x| *x == commandname) { arguments.drain(..=num); - }; + } arguments } diff --git a/utils/src/lib.rs b/utils/src/lib.rs index c09ea16..6f17b22 100644 --- a/utils/src/lib.rs +++ b/utils/src/lib.rs @@ -1,2 +1,3 @@ +pub mod args; pub mod commands; pub mod registry; diff --git a/utils/src/registry.rs b/utils/src/registry.rs index 05a7f66..9eff13c 100644 --- a/utils/src/registry.rs +++ b/utils/src/registry.rs @@ -28,3 +28,35 @@ impl CommandRegistry { } } } + +mod tests { + #[test] + fn test_register() { + use super::Command; + use super::CommandRegistry; + struct TestCommand; + impl Command for TestCommand { + fn execute(&self) {} + } + + let mut registry = CommandRegistry::new(); + registry.register("test", Box::new(TestCommand)); + assert!(registry.get("test").is_some()); + } + + #[test] + fn test_execute() { + use super::Command; + use super::CommandRegistry; + struct TestCommand; + impl Command for TestCommand { + fn execute(&self) { + println!("TestCommand executed"); + } + } + + let mut registry = CommandRegistry::new(); + registry.register("test", Box::new(TestCommand)); + registry.execute("test"); + } +}