From e1348e5c9487c83d76a68a86e568b6416e292fb8 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Fri, 12 Jan 2018 16:18:43 +0100 Subject: [PATCH] bugfix memLayout() (Windows) --- CHANGELOG.md | 1 + lib/filesystem.js | 2 +- lib/memory.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3aa1df..1b9d2fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,6 +99,7 @@ Other changes | Version | Date | Comment | | -------------- | -------------- | -------- | +| 3.33.13 | 2018-01-12 | bugfix `memLayout()` (Windows) | | 3.33.12 | 2017-12-25 | fixed typos | | 3.33.11 | 2017-12-17 | updated docs | | 3.33.10 | 2017-12-14 | bugfix WMIC blockDevice parse (Windows 7) | diff --git a/lib/filesystem.js b/lib/filesystem.js index 4ff01ab..e9663d8 100644 --- a/lib/filesystem.js +++ b/lib/filesystem.js @@ -708,7 +708,7 @@ function diskLayout(callback) { const size = util.getValue(lines, 'Size', '=').trim(); if (size) { result.push({ - type: device.indexOf('SSD') > -1 ? 'SSD' : 'HD', // not really correct(!) ... maybe this obe is better: MSFT_PhysicalDisk - Media Type?? + type: device.indexOf('SSD') > -1 ? 'SSD' : 'HD', // not really correct(!) ... maybe this one is better: MSFT_PhysicalDisk - Media Type?? name: util.getValue(lines, 'Caption', '='), vendor: util.getValue(lines, 'Manufacturer', '='), size: parseInt(size), diff --git a/lib/memory.js b/lib/memory.js index 8d4881c..5dd94f0 100644 --- a/lib/memory.js +++ b/lib/memory.js @@ -293,7 +293,7 @@ function memLayout(callback) { const memoryTypes = 'Unknown|Other|DRAM|Synchronous DRAM|Cache DRAM|EDO|EDRAM|VRAM|SRAM|RAM|ROM|FLASH|EEPROM|FEPROM|EPROM|CDRAM|3DRAM|SDRAM|SGRAM|RDRAM|DDR|DDR2|DDR2 FB-DIMM|Reserved|DDR3|FBD2|DDR4|LPDDR|LPDDR2|LPDDR3|LPDDR4'.split('|'); const FormFactors = 'Unknown|Other|SIP|DIP|ZIP|SOJ|Proprietary|SIMM|DIMM|TSOP|PGA|RIMM|SODIMM|SRIMM|SMD|SSMP|QFP|TQFP|SOIC|LCC|PLCC|BGA|FPBGA|LGA'.split('|'); - exec(util.getWmic() + 'wmic memorychip get BankLabel, Capacity, ConfiguredClockSpeed, ConfiguredVoltage, MaxVoltage, MinVoltage, DataWidth, FormFactor, Manufacturer, MemoryType, PartNumber, SerialNumber, Speed, Tag /value', function (error, stdout) { + exec(util.getWmic() + ' memorychip get BankLabel, Capacity, ConfiguredClockSpeed, ConfiguredVoltage, MaxVoltage, MinVoltage, DataWidth, FormFactor, Manufacturer, MemoryType, PartNumber, SerialNumber, Speed, Tag /value', function (error, stdout) { if (!error) { let devices = stdout.toString().split('BankL'); devices.shift();