proxmox-mirrors/proxmox-widget-toolkit
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-widget-toolkit synced 2025-05-28 12:14:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #3593: add CpuSet type to js

Browse Source 
Regex parses a cpuset via 2 matches. Find number(s) or range(s) folowed
by a comma, then, find a single number or a single range not followed
by a comma. E.g., 0-1,4-5,6,7,10,11,14-15
CpuSet function first checks regex, then ensures left num <= right num

Signed-off-by: Daniel Bowder <daniel@bowdernet.com>
This commit is contained in:
Daniel Bowder 2022-06-30 17:09:47 -07:00 committed by Wolfgang Bumiller
parent d17aa32eb4
commit 9109c39202
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Toolkit.js
View File

@ -121,6 +121,26 @@ Ext.apply(Ext.form.field.VTypes, {
},
HttpProxyText: gettext('Example') + ": http://username:password&#64;host:port/",
CpuSet: function(v) {
if (!Proxmox.Utils.CpuSet_match.test(v)) {
return false;
}
let groups = v.split(",");
for (let i = 0; i < groups.length; i++) {
if (!groups[i].includes("-")) {
continue;
}
let values = groups[i].split("-");
let left = parseInt(values[0], 10);
let right = parseInt(values[1], 10);
if (left > right) {
return false;
}
}
return true;
},
CpuSetText: gettext('This is not a valid CpuSet'),
DnsName: function(v) {
return Proxmox.Utils.DnsName_match.test(v);
},

2
src/Utils.js
View File

@ -1315,6 +1315,8 @@ utilities: {
me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$");
me.DnsName_or_Wildcard_match = new RegExp("^(?:\\*\\.)?" + DnsName_REGEXP + "$");
me.CpuSet_match = /^(?:(?:[0-9]+,)|(?:[0-9]+-[0-9]+,))*(?:(?:[0-9]+)$|(?:[0-9]+-[0-9]+)$)/;
me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")(?::(\\d+))?$");
me.HostPortBrackets_match = new RegExp("^\\[(" + IPV6_REGEXP + "|" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](?::(\\d+))?$");
me.IP6_dotnotation_match = new RegExp("^(" + IPV6_REGEXP + ")(?:\\.(\\d+))?$");