From 17980fe62d01c351d9876c8cd928749b9160b8cd Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 15 Jan 2020 14:02:29 +0100
Subject: [PATCH] proxmox-api/src/cli/format.rs: improve generate_usage_str()

List all arguments, and reduce empty lines.
---
 proxmox-api/src/cli/format.rs | 18 ++++++++----------
 proxmox-api/src/format.rs     |  2 --
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/proxmox-api/src/cli/format.rs b/proxmox-api/src/cli/format.rs
index 95ce68d3..36f4c19d 100644
--- a/proxmox-api/src/cli/format.rs
+++ b/proxmox-api/src/cli/format.rs
@@ -94,21 +94,18 @@ pub fn generate_usage_str(
 
         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 !options.is_empty() {
-                options.push('\n');
-            }
-            options.push_str(&get_property_description(
-                prop,
-                param_schema,
-                ParameterDisplayStyle::Arg,
-                format,
-            ));
+            options.push_str(&prop_descr);
         } else {
             args.push_str(" --");
             args.push_str(prop);
             args.push(' ');
             args.push_str(&type_text);
+
+            arg_descr.push_str(&prop_descr);
         }
 
         done_hash.insert(prop);
@@ -139,9 +136,10 @@ pub fn generate_usage_str(
 
     if !arg_descr.is_empty() {
         text.push_str(&arg_descr);
-        text.push('\n');
     }
+
     if !options.is_empty() {
+        text.push_str("Optional parameters:\n\n");
         text.push_str(&options);
         text.push('\n');
     }
diff --git a/proxmox-api/src/format.rs b/proxmox-api/src/format.rs
index d012e408..28d63c2a 100644
--- a/proxmox-api/src/format.rs
+++ b/proxmox-api/src/format.rs
@@ -137,7 +137,6 @@ pub fn get_property_description(
 
         text.push_str(&wrap_text("", "  ", descr, 80));
         text.push('\n');
-        text.push('\n');
 
         text
     } else {
@@ -152,7 +151,6 @@ pub fn get_property_description(
         text.push('\n');
         text.push_str(&wrap_text(indent, indent, descr, 80));
         text.push('\n');
-        text.push('\n');
 
         text
     }