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 5EDC77A9AD for ; Tue, 5 Jul 2022 15:09:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 48CAF2F3C0 for ; Tue, 5 Jul 2022 15:08:49 +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 for ; Tue, 5 Jul 2022 15:08:47 +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 6A6F343C5F for ; Tue, 5 Jul 2022 15:08:47 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 5 Jul 2022 13:08:08 +0000 Message-Id: <20220705130834.14285-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220705130834.14285-1-h.laimer@proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.012 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 PROLO_LEO2 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [schema.rs] Subject: [pbs-devel] [PATCH proxmox 1/1] schema: add print_property_string function 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: Tue, 05 Jul 2022 13:09:19 -0000 helpful when property string field are not updated through the API Signed-off-by: Hannes Laimer --- proxmox-schema/src/schema.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/proxmox-schema/src/schema.rs b/proxmox-schema/src/schema.rs index a2b165c..8c93452 100644 --- a/proxmox-schema/src/schema.rs +++ b/proxmox-schema/src/schema.rs @@ -7,6 +7,7 @@ use std::fmt; use anyhow::{bail, format_err, Error}; +use serde::Serialize; use serde_json::{json, Value}; use crate::ConstRegexPattern; @@ -932,6 +933,33 @@ impl Schema { Ok(value) } + /// Generate property string of structs with only simple fields + pub fn print_property_string(&'static self, data: &T) -> Result { + fn print_simple_value(value: Value) -> Result { + let string = match value { + Value::Bool(b) if b => "1".to_string(), + Value::Bool(_) => "0".to_string(), + Value::Number(n) => n.to_string(), + Value::String(s) => s, + _ => { + bail!("Only structs with only simple fields can be formatted as a property string.") + } + }; + Ok(string) + } + + match serde_json::to_value(data)? { + Value::Object(obj) => { + let mut props: Vec = Vec::new(); + for (key, value) in obj.into_iter() { + props.push(format!("{}=\"{}\"", key, print_simple_value(value)?)); + } + Ok(props.join(",")) + } + value => print_simple_value(value), + } + } + /// Parse a complex property string (`ApiStringFormat::PropertyString`) pub fn parse_property_string(&'static self, value_str: &str) -> Result { // helper for object/allof schemas: -- 2.30.2