OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first

Browse Source
This commit is contained in:
Meliox 2025-09-06 23:28:32 +02:00
parent 4d75d471fe
commit f6bcadfd5b
1 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
pve-mod-gui-sensors.sh
View File

@ -502,11 +502,11 @@ generate_drive_header() {
local temp_js_file="/tmp/drive_header.js" local temp_js_file="/tmp/drive_header.js"
#region drive header heredoc #region drive header heredoc
cat > "$temp_js_file" <<'EOF' cat > "$temp_js_file" <<'EOF'
{ {
xtype: 'box', xtype: 'box',
colspan: 2, colspan: 2,
html: gettext('Drive(s)'), html: gettext('Drive(s)'),
}, },
EOF EOF
#endregion drive header heredoc #endregion drive header heredoc
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
@ -612,11 +612,11 @@ add_visual_separator() {
#region visual spacing heredoc #region visual spacing heredoc
cat > "$temp_js_file" <<'EOF' cat > "$temp_js_file" <<'EOF'
{ {
xtype: 'box', xtype: 'box',
colspan: 2, colspan: 2,
padding: '0 0 20 0', padding: '0 0 20 0',
}, },
EOF EOF
#endregion visual spacing heredoc #endregion visual spacing heredoc
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
@ -972,68 +972,68 @@ generate_fan_widget() {
( (
export DISPLAY_ZERO_SPEED_FANS export DISPLAY_ZERO_SPEED_FANS
cat <<'EOF' | envsubst '$DISPLAY_ZERO_SPEED_FANS' > "$1" cat <<'EOF' | envsubst '$DISPLAY_ZERO_SPEED_FANS' > "$1"
{ {
xtype: 'box', xtype: 'box',
colspan: 2, colspan: 2,
html: gettext('Cooling'), html: gettext('Cooling'),
}, },
{ {
itemId: 'speedFan', itemId: 'speedFan',
colspan: 2, colspan: 2,
printBar: false, printBar: false,
title: gettext('Fan Speed(s)'), title: gettext('Fan Speed(s)'),
iconCls: 'fa fa-fw fa-snowflake-o', iconCls: 'fa fa-fw fa-snowflake-o',
textField: 'sensorsOutput', textField: 'sensorsOutput',
renderer: function(value) { renderer: function(value) {
// --- // ---
let objValue; let objValue;
try { try {
objValue = JSON.parse(value) || {}; objValue = JSON.parse(value) || {};
} catch(e) { } catch(e) {
objValue = {}; objValue = {};
}
// Recursive function to find fan keys and values
function findFanKeys(obj, fanKeys, parentKey = null) {
Object.keys(obj).forEach(key => {
const value = obj[key];
if (typeof value === 'object' && value !== null) {
// If the value is an object, recursively call the function
findFanKeys(value, fanKeys, key);
} else if (/^fan[0-9]+(_input)?$/.test(key)) {
if ($DISPLAY_ZERO_SPEED_FANS != true && value === 0) {
// Skip this fan if DISPLAY_ZERO_SPEED_FANS is false and value is 0
return;
}
// If the key matches the pattern, add the parent key and value to the fanKeys array
fanKeys.push({ key: parentKey, value: value });
}
});
}
let speeds = [];
// Loop through the parent keys
Object.keys(objValue).forEach(parentKey => {
const parentObj = objValue[parentKey];
// Array to store fan keys and values
const fanKeys = [];
// Call the recursive function to find fan keys and values
findFanKeys(parentObj, fanKeys);
// Sort the fan keys
fanKeys.sort();
// Process each fan key and value
fanKeys.forEach(({ key: fanKey, value: fanSpeed }) => {
try {
const fan = fanKey.charAt(0).toUpperCase() + fanKey.slice(1); // Capitalize the first letter of fanKey
speeds.push(`${fan}:&nbsp;${fanSpeed} RPM`);
} catch(e) {
console.error(`Error retrieving fan speed for ${fanKey} in ${parentKey}:`, e); // Debug: Log specific error
}
});
});
return '<div style="text-align: left; margin-left: 28px;">' + (speeds.length > 0 ? speeds.join(' | ') : 'N/A') + '</div>';
} }
},
// Recursive function to find fan keys and values
function findFanKeys(obj, fanKeys, parentKey = null) {
Object.keys(obj).forEach(key => {
const value = obj[key];
if (typeof value === 'object' && value !== null) {
// If the value is an object, recursively call the function
findFanKeys(value, fanKeys, key);
} else if (/^fan[0-9]+(_input)?$/.test(key)) {
if ($DISPLAY_ZERO_SPEED_FANS != true && value === 0) {
// Skip this fan if DISPLAY_ZERO_SPEED_FANS is false and value is 0
return;
}
// If the key matches the pattern, add the parent key and value to the fanKeys array
fanKeys.push({ key: parentKey, value: value });
}
});
}
let speeds = [];
// Loop through the parent keys
Object.keys(objValue).forEach(parentKey => {
const parentObj = objValue[parentKey];
// Array to store fan keys and values
const fanKeys = [];
// Call the recursive function to find fan keys and values
findFanKeys(parentObj, fanKeys);
// Sort the fan keys
fanKeys.sort();
// Process each fan key and value
fanKeys.forEach(({ key: fanKey, value: fanSpeed }) => {
try {
const fan = fanKey.charAt(0).toUpperCase() + fanKey.slice(1); // Capitalize the first letter of fanKey
speeds.push(`${fan}:&nbsp;${fanSpeed} RPM`);
} catch(e) {
console.error(`Error retrieving fan speed for ${fanKey} in ${parentKey}:`, e); // Debug: Log specific error
}
});
});
return '<div style="text-align: left; margin-left: 28px;">' + (speeds.length > 0 ? speeds.join(' | ') : 'N/A') + '</div>';
}
},
EOF EOF
) )
#endregion fan widget heredoc #endregion fan widget heredoc