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 7B306632C3 for ; Mon, 14 Feb 2022 15:02:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C74223345 for ; Mon, 14 Feb 2022 15:02:05 +0100 (CET) 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 8C86323310 for ; Mon, 14 Feb 2022 15:02:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 655514619C for ; Mon, 14 Feb 2022 15:02:03 +0100 (CET) From: Matthias Heiserer To: pve-devel@lists.proxmox.com Date: Mon, 14 Feb 2022 15:01:38 +0100 Message-Id: <20220214140144.961041-2-m.heiserer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214140144.961041-1-m.heiserer@proxmox.com> References: <20220214140144.961041-1-m.heiserer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [RFC manager 1/5] GUI: Parser: add comment support 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: Mon, 14 Feb 2022 14:02:05 -0000 Comments are automatically (en|de)coded in QemuNetwork, PropertyString or QemuDrive. For fields not using these, (en|de)coding utility functions are provided. Signed-off-by: Matthias Heiserer --- www/manager6/Parser.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js index 9f7b2c84..e52c7688 100644 --- a/www/manager6/Parser.js +++ b/www/manager6/Parser.js @@ -60,6 +60,9 @@ Ext.define('PVE.Parser', { value.split(',').forEach(property => { let [k, v] = property.split('=', 2); if (Ext.isDefined(v)) { + if (k === 'comment') { + v = PVE.Parser.parseComment(v); + } res[k] = v; } else if (Ext.isDefined(defaultKey)) { if (Ext.isDefined(res[defaultKey])) { @@ -84,6 +87,9 @@ Ext.define('PVE.Parser', { defaultKeyVal; Ext.Object.each(data, function(key, value) { + if (key === 'comment') { + value = PVE.Parser.encodeComment(value); + } if (defaultKey !== undefined && key === defaultKey) { gotDefaultKeyVal = true; defaultKeyVal = value; @@ -135,6 +141,8 @@ Ext.define('PVE.Parser', { res.trunks = match_res[1]; } else if ((match_res = p.match(/^mtu=(\d+)$/)) !== null) { res.mtu = match_res[1]; + } else if ((match_res = p.match(/^comment=(.*)$/)) !== null) { + res.comment = PVE.Parser.parseComment(match_res[1]); } else { errors = true; return false; // break @@ -178,6 +186,9 @@ Ext.define('PVE.Parser', { if (net.mtu) { netstr += ",mtu=" + net.mtu; } + if (net.comment) { + netstr += ",comment=" + PVE.Parser.encodeComment(net.comment); + } return netstr; }, @@ -239,6 +250,9 @@ Ext.define('PVE.Parser', { var drivestr = drive.file; Ext.Object.each(drive, function(key, value) { + if (key === 'comment') { + value = PVE.Parser.encodeComment(value); + } if (!Ext.isDefined(value) || key === 'file' || key === 'index' || key === 'interface') { return; // continue @@ -601,5 +615,13 @@ Ext.define('PVE.Parser', { }); return [res, extradata]; }, + + parseComment: function(comment) { + return decodeURIComponent(comment ?? ''); + }, + + encodeComment: function(comment) { + return encodeURIComponent(comment); + }, }, }); -- 2.30.2