[pve-devel] [RFC manager 1/5] GUI: Parser: add comment support

[Matthias Heiserer]

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.heise...@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



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel