proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-29 13:52:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxmox-api/src/cli/format.rs: improve generate_usage_str()

Browse Source 
List all arguments, and reduce empty lines.
This commit is contained in:
Dietmar Maurer 2020-01-15 14:02:29 +01:00
parent 66d117f422
commit 17980fe62d
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
proxmox-api/src/cli/format.rs
View File

@ -94,21 +94,18 @@ pub fn generate_usage_str(
let type_text = get_schema_type_text(param_schema, ParameterDisplayStyle::Arg); let type_text = get_schema_type_text(param_schema, ParameterDisplayStyle::Arg);
let prop_descr =
get_property_description(prop, param_schema, ParameterDisplayStyle::Arg, format);
if *optional { if *optional {
if !options.is_empty() { options.push_str(&prop_descr);
options.push('\n');
}
options.push_str(&get_property_description(
prop,
param_schema,
ParameterDisplayStyle::Arg,
format,
));
} else { } else {
args.push_str(" --"); args.push_str(" --");
args.push_str(prop); args.push_str(prop);
args.push(' '); args.push(' ');
args.push_str(&type_text); args.push_str(&type_text);
arg_descr.push_str(&prop_descr);
} }
done_hash.insert(prop); done_hash.insert(prop);
@ -139,9 +136,10 @@ pub fn generate_usage_str(
if !arg_descr.is_empty() { if !arg_descr.is_empty() {
text.push_str(&arg_descr); text.push_str(&arg_descr);
text.push('\n');
} }
if !options.is_empty() { if !options.is_empty() {
text.push_str("Optional parameters:\n\n");
text.push_str(&options); text.push_str(&options);
text.push('\n'); text.push('\n');
} }

2
proxmox-api/src/format.rs
View File

@ -137,7 +137,6 @@ pub fn get_property_description(
text.push_str(&wrap_text("", " ", descr, 80)); text.push_str(&wrap_text("", " ", descr, 80));
text.push('\n'); text.push('\n');
text.push('\n');
text text
} else { } else {
@ -152,7 +151,6 @@ pub fn get_property_description(
text.push('\n'); text.push('\n');
text.push_str(&wrap_text(indent, indent, descr, 80)); text.push_str(&wrap_text(indent, indent, descr, 80));
text.push('\n'); text.push('\n');
text.push('\n');
text text
} }