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

Recursively find fan_inputs

Browse Source
This commit is contained in:
Meliox 2024-05-27 21:43:26 +02:00
parent ddf7274cda
commit 75a847979d
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,21 +581,37 @@ Ext.define('PVE.mod.TempHelper', {\n\
} catch(e) {\n\
objValue = {};\n\
}\n\
\n\
// Recursive function to find fan keys and values\n\
function findFanKeys(obj, fanKeys) {\n\
Object.keys(obj).forEach(key => {\n\
const value = obj[key];\n\
if (typeof value === 'object' && value !== null) {\n\
// If the value is an object, recursively call the function\n\
findFanKeys(value, fanKeys);\n\
} else if (/^fan[0-9]+(_input)?$/.test(key)) {\n\
// If the key matches the pattern, add the key-value pair to the fanKeys array\n\
fanKeys.push({ key: key, value: value });\n\
}\n\
});\n\
}\n\
\n\
let speeds = [];\n\
// Loop through the parent keys\n\
Object.keys(objValue).forEach(parentKey => {\n\
const parentObj = objValue[parentKey];\n\
// Filter and sort fan keys for each parent object\n\
const fanKeys = Object.keys(parentObj).filter(item => /^fan[0-9]+(_input)?$/.test(item)).sort();\n\
fanKeys.forEach((fanKey) => {\n\
// Array to store fan keys and values\n\
const fanKeys = [];\n\
// Call the recursive function to find fan keys and values\n\
findFanKeys(parentObj, fanKeys);\n\
// Sort the fan keys\n\
fanKeys.sort();\n\
// Process each fan key and value\n\
fanKeys.forEach(({ key: fanKey, value: fanSpeed }) => {\n\
try {\n\
const fanSpeed = parentObj[fanKey];\n\
const fanNumber = fanKey.match(/^fan([0-9]+)(_input)?$/)[1]; // Extract fan number from the key\n\
if (fanSpeed && typeof fanSpeed === 'object' && \`fan\${fanNumber}_input\` in fanSpeed) {\n\
speeds.push(\`Fan \${fanNumber}: \${fanSpeed[\`fan\${fanNumber}_input\`]} RPM\`);\n\
} else if (typeof fanSpeed === 'number') {\n\
// Extract fan number from the key\n\
const fanNumber = fanKey.match(/^fan([0-9]+)(_input)?$/)[1];\n\
speeds.push(\`Fan \${fanNumber}: \${fanSpeed} RPM\`);\n\
}\n\
} catch(e) {\n\
console.error(\`Error retrieving fan speed for \${fanKey} in \${parentKey}:\`, e); // Debug: Log specific error\n\
}\n\