all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Matthias Heiserer <m.heiserer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [RFC manager 1/5] GUI: Parser: add comment support
Date: Mon, 14 Feb 2022 15:01:38 +0100	[thread overview]
Message-ID: <20220214140144.961041-2-m.heiserer@proxmox.com> (raw)
In-Reply-To: <20220214140144.961041-1-m.heiserer@proxmox.com>

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 <m.heiserer@proxmox.com>
---
 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





  reply	other threads:[~2022-02-14 14:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-14 14:01 [pve-devel] [RFC manager 0/5] GUI: Hardware comments Matthias Heiserer
2022-02-14 14:01 ` Matthias Heiserer [this message]
2022-02-14 14:01 ` [pve-devel] [RFC qemu-server 1/2] QEMU: add comment helper Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 2/5] GUI: Utils: add comment renderer and field provider Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC qemu-server 2/2] QEMU: add comment fields Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 3/5] GUI: QEMU Hardware: add comment column Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 4/5] GUI: QEMU Hardware: multikey support for comments Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 5/5] GUI: QEMU Hardware: add comment fields to rows Matthias Heiserer
2022-02-14 14:27 ` [pve-devel] [RFC manager 0/5] GUI: Hardware comments Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220214140144.961041-2-m.heiserer@proxmox.com \
    --to=m.heiserer@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal