mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

baseboard() improved parsing (windows)

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2023-09-18 06:02:46 +02:00
parent 734b52e28b
commit 1b62892f86
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/system.js
+6 -8
View File
@@ -318,10 +318,11 @@ function system(callback) {
exports.system = system;
function cleanDefaults(s) {
if (s === 'Default string') { s = ''; }
if (s.toLowerCase().indexOf('o.e.m.') !== -1) { s = ''; }
return s
const cmpStr = s.toLowerCase();
if (cmpStr.indexOf('o.e.m.') === -1 && cmpStr.indexOf('default string') === -1 && cmpStr !== 'default') {
return s || '';
}
return '';
}
function bios(callback) {
@@ -561,7 +562,7 @@ function baseboard(callback) {
const workload = [];
const win10plus = parseInt(os.release()) >= 10;
const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity';
workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU,SMBIOSAssetTag | fl'));
workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl'));
workload.push(util.powerShell(`Get-CimInstance Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
util.promiseAll(
workload
@@ -579,9 +580,6 @@ function baseboard(callback) {
if (!result.assetTag) {
result.assetTag = cleanDefaults(util.getValue(lines, 'sku', ':'));
}
if (!result.assetTag) {
result.assetTag = cleanDefaults(util.getValue(lines, 'SMBIOSAssetTag', ':'));
}
// memphysical
lines = data.results[1] ? data.results[1].toString().split('\r\n') : [''];