tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove parameter macro, implement ObjectSchema builder

Browse Source 
And store "optional" attribute inside properties hash.
This commit is contained in:
Dietmar Maurer
2018-11-23 11:34:15 +01:00
parent 82df76fff0
commit 7edeec7b06
5 changed files with 112 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/getopts.rs
View File

@ -75,7 +75,7 @@ pub fn parse_arguments(
None => {
let mut want_bool = false;
let mut can_default = false;
if let Some(param_schema) = properties.get::<str>(&name) {
if let Some((_optional, param_schema)) = properties.get::<str>(&name) {
if let Schema::Boolean(boolean_schema) = param_schema.as_ref() {
want_bool = true;
if let Some(default) = boolean_schema.default {
@ -156,7 +156,11 @@ pub fn parse_arguments(
#[test]
fn test_boolean_arg() {
let schema = parameter!{enable => BooleanSchema::new("Enable").optional(false).arc()};
let schema = ObjectSchema::new("Parameters:")
.required(
"enable", BooleanSchema::new("Enable")
.arc()
);
let mut variants: Vec<(Vec<&str>, bool)> = vec![];
variants.push((vec!["-enable"], true));
@ -186,10 +190,9 @@ fn test_boolean_arg() {
#[test]
fn test_argument_paramenter() {
let schema = parameter!{
enable => BooleanSchema::new("Enable.").optional(false).arc(),
storage => StringSchema::new("Storatge:").optional(false).arc()
};
let schema = ObjectSchema::new("Parameters:")
.required("enable", BooleanSchema::new("Enable.").arc())
.required("storage", StringSchema::new("Storage.").arc());
let args = vec!["-enable", "local"];
let string_args = args.iter().map(|s| s.to_string()).collect();