removed optionality it does not make sense

This commit is contained in:
nora 2021-10-01 22:25:17 +02:00
parent a33b81c58e
commit 2ec1f142a9
5 changed files with 52 additions and 35 deletions

View file

@ -9,6 +9,7 @@ type Result<T> = std::result::Result<T, CallError>;
#[derive(Debug, Default)]
pub struct CliArgs {
args: HashMap<&'static str, Box<dyn Any>>,
unnamed: Vec<String>,
}
impl CliArgs {
@ -21,7 +22,7 @@ impl CliArgs {
parse_shorts(schema, &mut result, shorts, &mut args)?;
} else if let Some(_longs) = arg.strip_prefix("--") {
} else {
return Err(CallError::UnnamedArgument);
result.unnamed.push(arg);
}
}
@ -35,6 +36,10 @@ impl CliArgs {
any.downcast_ref()
}
pub fn unnamed(&self) -> &[String] {
&self.unnamed
}
fn insert(&mut self, long: &'static str, value: Box<dyn Any>) {
self.args.insert(long, value);
}
@ -62,12 +67,30 @@ fn parse_shorts(
match command.kind {
SchemaKind::String => {
let next = args
let string = args
.next()
.ok_or_else(|| CallError::ExpectedValue(command.long.to_string()))?;
results.insert(command.long, Box::new(next));
results.insert(command.long, Box::new(string));
}
SchemaKind::INum => {
let integer = args
.next()
.ok_or_else(|| CallError::ExpectedValue(command.long.to_string()))?
.parse::<isize>()
.map_err(|_| CallError::INan(command.long.to_string()))?;
results.insert(command.long, Box::new(integer))
}
SchemaKind::UNum => {
let integer = args
.next()
.ok_or_else(|| CallError::ExpectedValue(command.long.to_string()))?
.parse::<usize>()
.map_err(|_| CallError::UNan(command.long.to_string()))?;
results.insert(command.long, Box::new(integer))
}
SchemaKind::Bool => {
results.insert(command.long, Box::new(true));
}
_ => todo!(),
}
} else {
return Err(CallError::SingleMinus);
@ -84,7 +107,7 @@ mod test {
use crate::arg;
use crate::schema::Schema;
arg!(OutFile: "output", 'o' -> Option<String>);
arg!(OutFile: "output", 'o' -> String);
arg!(Input: "input", 'i' -> String);
arg!(Force: "force", 'f' -> bool);
arg!(SetUpstream: "set-upstream" -> String);
@ -109,4 +132,17 @@ mod test {
let args = parse_args("-i stdin").unwrap();
assert_eq!(args.get::<String>("input"), Some(&"stdin".to_string()))
}
#[test]
fn two_unnamed() {
let args = parse_args("hallo welt").unwrap();
assert_eq!(args.unnamed(), &["hallo", "welt"]);
}
#[test]
fn arg_param_and_unnamed() {
let args = parse_args("-i stdin uwu").unwrap();
assert_eq!(args.unnamed(), &["uwu"]);
assert_eq!(args.get::<String>("input"), Some(&"stdin".to_string()))
}
}