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 1989C6A000 for ; Wed, 15 Sep 2021 15:43:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F18EB19CEB for ; Wed, 15 Sep 2021 15:42:30 +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 4EA4719C74 for ; Wed, 15 Sep 2021 15:42:30 +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 262074489C for ; Wed, 15 Sep 2021 15:42:30 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 15 Sep 2021 15:41:56 +0200 Message-Id: <20210915134157.19762-10-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210915134157.19762-1-f.gruenbichler@proxmox.com> References: <20210915134157.19762-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.378 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sync.rs] Subject: [pve-devel] [PATCH v2 proxmox-backup 09/10] manager: render group filter properly X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2021 13:43:01 -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 2dbef119..fd312e9e 100644 --- a/src/bin/proxmox_backup_manager/sync.rs +++ b/src/bin/proxmox_backup_manager/sync.rs @@ -7,6 +7,18 @@ use pbs_api_types::JOB_ID_SCHEMA; use proxmox_backup::api2; +fn render_group_filter(value: &Value, _record: &Value) -> Result { + if let Some(group_filters) = value.as_array() { + let group_filters:Vec<&str> = group_filters + .iter() + .filter_map(Value::as_str) + .collect(); + Ok(group_filters.join(" OR ")) + } else { + Ok(String::from("all")) + } +} + #[api( input: { properties: { @@ -34,6 +46,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_group_filter(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