From f0475c2207181c13dabcd4e78a163cde70573ade Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sat, 4 Apr 2026 17:52:19 +0800 Subject: Add vector pickers --- mingling/Cargo.lock | 8 +--- mingling/Cargo.toml | 6 +-- mingling/src/parser/args.rs | 69 +++++++++++++++++++++++++++++------ mingling/src/parser/picker/builtin.rs | 42 +++++++++++++++++++++ 4 files changed, 105 insertions(+), 20 deletions(-) (limited to 'mingling') diff --git a/mingling/Cargo.lock b/mingling/Cargo.lock index b3559d8..ef9be06 100644 --- a/mingling/Cargo.lock +++ b/mingling/Cargo.lock @@ -16,7 +16,7 @@ checksum = "5454cda0d57db59778608d7a47bff5b16c6705598265869fb052b657f66cf05e" [[package]] name = "mingling" -version = "0.1.3" +version = "0.1.4" dependencies = [ "mingling", "mingling_core", @@ -27,9 +27,7 @@ dependencies = [ [[package]] name = "mingling_core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "582a051d0598bb23b4b5103f9a3f5cf6b3b825f3b01b1612640ba88bbeb4ff07" +version = "0.1.3" dependencies = [ "just_fmt", "serde", @@ -40,8 +38,6 @@ dependencies = [ [[package]] name = "mingling_macros" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e324eedf81f8b4c2947d6ce96dbd763a2da0d3b182c3f9c550974407f81c19" dependencies = [ "just_fmt", "once_cell", diff --git a/mingling/Cargo.toml b/mingling/Cargo.toml index 10bf41d..68f37f9 100644 --- a/mingling/Cargo.toml +++ b/mingling/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mingling" -version = "0.1.3" +version = "0.1.4" edition = "2024" authors = ["Weicao-CatilGrass"] license = "MIT OR Apache-2.0" @@ -25,7 +25,7 @@ general_renderer = [ parser = ["dep:size"] [dependencies] -mingling_core = { version = "0.1.2", default-features = false } -mingling_macros = { version = "0.1.2", default-features = false } +mingling_core = { path = "../mingling_core", default-features = false } +mingling_macros = { path = "../mingling_macros", default-features = false } serde = { version = "1.0", features = ["derive"], optional = true } size = { version = "0.5", optional = true } diff --git a/mingling/src/parser/args.rs b/mingling/src/parser/args.rs index 0210b56..084051d 100644 --- a/mingling/src/parser/args.rs +++ b/mingling/src/parser/args.rs @@ -1,6 +1,6 @@ use std::mem::replace; -use mingling_core::{Flag, special_argument, special_flag}; +use mingling_core::{Flag, special_argument, special_arguments, special_flag}; /// User input arguments #[derive(Debug, Default)] @@ -67,32 +67,79 @@ impl std::ops::DerefMut for Argument { } impl Argument { - /// Extracts argument (with value) from arguments + /// Picks a single argument with the given flag pub fn pick_argument(&mut self, flag: F) -> Option where F: Into, { + if self.len() < 1 { + return None; + } + let flag: Flag = flag.into(); - for argument in flag.iter() { - let value = special_argument!(self.vec, argument); - if value.is_some() { - return value; + if flag.len() > 0 { + // Has any flag + for argument in flag.iter() { + let value = special_argument!(self.vec, argument); + if value.is_some() { + return value; + } } + } else { + // No flag + return Some(self.vec.remove(0)); } None } - /// Extracts flags from arguments - pub fn pick_flag(&mut self, flag: F) -> bool + /// Picks arguments with the given flag + pub fn pick_arguments(&mut self, flag: F) -> Vec where F: Into, { + let mut str_result = Vec::new(); + + if self.len() < 1 { + return str_result; + } + let flag: Flag = flag.into(); for argument in flag.iter() { - let enabled = special_flag!(self.vec, argument); - if enabled { - return enabled; + let value = special_arguments!(self.vec, argument); + str_result.extend(value); + } + + str_result + } + + /// Picks a flag with the given flag + pub fn pick_flag(&mut self, flag: F) -> bool + where + F: Into, + { + if self.len() < 1 { + return false; + } + + let flag: Flag = flag.into(); + if flag.len() > 0 { + // Has any flag + for argument in flag.iter() { + let enabled = special_flag!(self.vec, argument); + if enabled { + return enabled; + } } + } else { + let first = self.vec.remove(0); + let first_lower = first.to_lowercase(); + let trimmed = first_lower.trim(); + let result = match trimmed { + "y" | "yes" | "true" | "1" => return true, + "n" | "no" | "false" | "0" => return false, + _ => false, + }; + return result; } false } diff --git a/mingling/src/parser/picker/builtin.rs b/mingling/src/parser/picker/builtin.rs index 9184813..8a10dfc 100644 --- a/mingling/src/parser/picker/builtin.rs +++ b/mingling/src/parser/picker/builtin.rs @@ -10,6 +10,14 @@ impl Pickable for String { } } +impl Pickable for Vec { + type Output = Vec; + + fn pick(args: &mut crate::parser::Argument, flag: mingling_core::Flag) -> Option { + Some(args.pick_arguments(flag)) + } +} + macro_rules! impl_pickable_for_number { ($($t:ty),*) => { $( @@ -23,6 +31,23 @@ macro_rules! impl_pickable_for_number { picked.parse().ok() } } + + impl Pickable for Vec<$t> { + type Output = Vec<$t>; + + fn pick(args: &mut crate::parser::Argument, flag: mingling_core::Flag) -> Option { + let picked_vec = args.pick_arguments(flag); + let mut result = Vec::new(); + for picked in picked_vec { + if let Ok(parsed) = picked.parse() { + result.push(parsed); + } else { + return None; + } + } + Some(result) + } + } )* }; } @@ -52,6 +77,23 @@ impl Pickable for usize { } } +impl Pickable for Vec { + type Output = Vec; + + fn pick(args: &mut crate::parser::Argument, flag: mingling_core::Flag) -> Option { + let picked_vec = args.pick_arguments(flag); + let mut result = Vec::new(); + for picked in picked_vec { + let size_parse = Size::from_str(picked.as_str()); + match size_parse { + Ok(size) => result.push(size.bytes() as usize), + Err(_) => return None, + } + } + Some(result) + } +} + impl Pickable for Argument { type Output = Argument; -- cgit