From 77b85f7dc1a16d2f97d9a9f9473a95900dbb5ee9 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Fri, 30 Apr 2021 14:51:55 +0200 Subject: [PATCH] proxmox/api/cli: add extract_output_format just getting it is not enough, sometimes we want it to remove from params (if possble) too Signed-off-by: Dominik Csapak --- proxmox/src/api/cli/text_table.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/proxmox/src/api/cli/text_table.rs b/proxmox/src/api/cli/text_table.rs index 5ff2db09..84d9f346 100644 --- a/proxmox/src/api/cli/text_table.rs +++ b/proxmox/src/api/cli/text_table.rs @@ -25,6 +25,18 @@ pub fn get_output_format(param: &Value) -> String { output_format.unwrap_or_else(|| String::from("text")) } +/// Helper to get output format from parameters or environment +/// and removing from parameters +pub fn extract_output_format(param: &mut Value) -> String { + let output_format = get_output_format(param); + + if let Some(param) = param.as_object_mut() { + param.remove("output-format"); + } + + output_format +} + /// Helper to get TableFormatOptions with default from environment pub fn default_table_format_options() -> TableFormatOptions { let no_border = std::env::var(ENV_VAR_PROXMOX_OUTPUT_NO_BORDER)