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 02B8678DC1 for ; Mon, 3 May 2021 09:04:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E5EE319DF7 for ; Mon, 3 May 2021 09:03:56 +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 76C7419DE8 for ; Mon, 3 May 2021 09:03:56 +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 494C9427DC for ; Mon, 3 May 2021 09:03:56 +0200 (CEST) To: Proxmox Backup Server development discussion , Dominik Csapak References: <20210430125156.20072-1-d.csapak@proxmox.com> <20210430125156.20072-2-d.csapak@proxmox.com> From: Dietmar Maurer Message-ID: Date: Mon, 3 May 2021 09:03:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210430125156.20072-2-d.csapak@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.270 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] applied: [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: Mon, 03 May 2021 07:04:27 -0000 applied On 4/30/21 2:51 PM, Dominik Csapak wrote: > 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)