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

bugfix diskLayout().size (OSX)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2017-12-02 11:58:58 +01:00
parent c67ebeadd0
commit 5f2ff90666
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -99,6 +99,7 @@ Other changes
| Version | Date | Comment | | Version | Date | Comment |
| -------------- | -------------- | -------- | | -------------- | -------------- | -------- |
| 3.33.8 | 2017-12-02 | bugfix diskLayout().size (OSX) |
| 3.33.7 | 2017-11-28 | bugfix diskLayout().size | | 3.33.7 | 2017-11-28 | bugfix diskLayout().size |
| 3.33.6 | 2017-11-16 | bugfix diskLayout().size | | 3.33.6 | 2017-11-16 | bugfix diskLayout().size |
| 3.33.5 | 2017-11-09 | code cleanup | | 3.33.5 | 2017-11-09 | code cleanup |

28
lib/filesystem.js
View File

@ -625,16 +625,19 @@ function diskLayout(callback) {
const mediumType = util.getValue(lines, 'Medium Type', ':', true).trim(); const mediumType = util.getValue(lines, 'Medium Type', ':', true).trim();
const sizeStr = util.getValue(lines, 'capacity', ':', true).trim(); const sizeStr = util.getValue(lines, 'capacity', ':', true).trim();
if (sizeStr) { if (sizeStr) {
let size = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '')); let sizeValue = 0;
if (!size) { if (sizeStr.indexOf('(') >= 0) {
size = parseInt(sizeStr); sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, ''));
} }
if (size) { if (!sizeValue) {
sizeValue = parseInt(sizeStr);
}
if (sizeValue) {
result.push({ result.push({
type: mediumType.startsWith('Solid') ? 'SSD' : 'HD', type: mediumType.startsWith('Solid') ? 'SSD' : 'HD',
name: util.getValue(lines, 'Model', ':', true).trim(), name: util.getValue(lines, 'Model', ':', true).trim(),
vendor: '', vendor: '',
size: size, size: sizeValue,
bytesPerSector: -1, bytesPerSector: -1,
totalCylinders: -1, totalCylinders: -1,
totalHeads: -1, totalHeads: -1,
@ -658,16 +661,19 @@ function diskLayout(callback) {
const linkWidth = util.getValue(lines, 'link width', ':', true).trim(); const linkWidth = util.getValue(lines, 'link width', ':', true).trim();
const sizeStr = util.getValue(lines, '!capacity', ':', true).trim(); const sizeStr = util.getValue(lines, '!capacity', ':', true).trim();
if (sizeStr) { if (sizeStr) {
let size = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '')); let sizeValue = 0;
if (!size) { if (sizeStr.indexOf('(') >= 0) {
size = parseInt(sizeStr); sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, ''));
} }
if (size) { if (!sizeValue) {
result.push({ sizeValue = parseInt(sizeStr);
}
if (sizeValue) {
result.push({
type: 'NVMe', type: 'NVMe',
name: util.getValue(lines, 'Model', ':', true).trim(), name: util.getValue(lines, 'Model', ':', true).trim(),
vendor: '', vendor: '',
size: size, size: sizeValue,
bytesPerSector: -1, bytesPerSector: -1,
totalCylinders: -1, totalCylinders: -1,
totalHeads: -1, totalHeads: -1,