From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 95BFA787BF for ; Fri, 30 Apr 2021 14:52:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 85AD987D6 for ; Fri, 30 Apr 2021 14:51:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 44CD28739 for ; Fri, 30 Apr 2021 14:51:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1A9B84298A for ; Fri, 30 Apr 2021 14:51:57 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 30 Apr 2021 14:51:55 +0200 Message-Id: <20210430125156.20072-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210430125156.20072-1-d.csapak@proxmox.com> References: <20210430125156.20072-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox 1/1] proxmox/api/cli: add extract_output_format X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2021 12:52:28 -0000 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 5ff2db0..84d9f34 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) -- 2.20.1