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 8B2B868BDF for ; Thu, 22 Jul 2021 16:36:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E57613031 for ; Thu, 22 Jul 2021 16:35:48 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3DF6C1301B for ; Thu, 22 Jul 2021 16:35:43 +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 14EAB42587 for ; Thu, 22 Jul 2021 16:35:43 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 16:35:09 +0200 Message-Id: <20210722143510.238967-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210722143510.238967-1-f.gruenbichler@proxmox.com> References: <20210722143510.238967-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.450 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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-backup 6/7] manager: render group filter properly 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: Thu, 22 Jul 2021 14:36:22 -0000 Signed-off-by: Fabian Grünbichler --- src/bin/proxmox_backup_manager/sync.rs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/bin/proxmox_backup_manager/sync.rs b/src/bin/proxmox_backup_manager/sync.rs index 0c9bac49..a2c36854 100644 --- a/src/bin/proxmox_backup_manager/sync.rs +++ b/src/bin/proxmox_backup_manager/sync.rs @@ -6,6 +6,18 @@ use proxmox::api::{api, cli::*, RpcEnvironment, ApiHandler}; use proxmox_backup::config; use proxmox_backup::api2::{self, types::* }; +fn render_groups(value: &Value, _record: &Value) -> Result { + if let Some(groups) = value.as_array() { + let groups:Vec<&str> = groups + .iter() + .filter_map(Value::as_str) + .collect(); + Ok(groups.join(", ")) + } else { + Ok(String::from("all")) + } +} + #[api( input: { properties: { @@ -33,6 +45,7 @@ fn list_sync_jobs(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result Result unreachable!(), }; + if let Some(groups) = data.get_mut("groups") { + if let Ok(rendered) = render_groups(groups, groups) { + *groups = Value::String(rendered); + } + } + let options = default_table_format_options(); format_and_print_result_full(&mut data, &info.returns, &output_format, &options); -- 2.30.2