diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c4cd6..64c83d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 5.0.11 | 2020-02-07 | `fsSize()` fixed windows WSL issue | | 5.0.10 | 2020-02-06 | `getDynamicData()` fixed windows WSL issue | | 5.0.9 | 2020-02-02 | `fsSize()` fixed parsing edge case issue mac OS | | 5.0.8 | 2020-01-30 | typescript typings fix cpuCurrentSpeed | diff --git a/docs/history.html b/docs/history.html index eceddd8..c34bc31 100644 --- a/docs/history.html +++ b/docs/history.html @@ -56,6 +56,11 @@ + + 5.0.11 + 2020-02-07 + fsSize() windows WSL fix + 5.0.10 2020-02-06 diff --git a/docs/index.html b/docs/index.html index 4040364..4fa7ce5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.0.10
+
New Version: 5.0.11
diff --git a/lib/filesystem.js b/lib/filesystem.js index e883d25..8fef85a 100755 --- a/lib/filesystem.js +++ b/lib/filesystem.js @@ -52,7 +52,7 @@ function fsSize(callback) { lines.forEach(function (line) { if (line !== '') { line = line.replace(/ +/g, ' ').split(' '); - if (line && ((line[0].startsWith('/')) || (line[6] && line[6] === '/') || (line[0].indexOf('/') > 0))) { + if (line && ((line[0].startsWith('/')) || (line[6] && line[6] === '/') || (line[0].indexOf('/') > 0) || (line[0].indexOf(':') === 1))) { const fs = line[0]; const fsType = ((_linux || _freebsd || _openbsd || _netbsd) ? line[1] : getmacOsFsType(line[0])); const size = parseInt(((_linux || _freebsd || _openbsd || _netbsd) ? line[2] : line[1])) * 1024; @@ -129,15 +129,17 @@ function fsSize(callback) { lines.forEach(function (line) { if (line !== '') { line = line.trim().split(/\s\s+/); - data.push({ - fs: line[0], - type: line[1], - size: parseInt(line[3], 10), - used: parseInt(line[3], 10) - parseInt(line[2], 10), - available: parseInt(line[2], 10), - use: parseFloat((100.0 * (parseInt(line[3]) - parseInt(line[2]))) / parseInt(line[3])), - mount: line[0] - }); + if (line.length >= 4 && parseInt(line[3], 10)) { + data.push({ + fs: line[0], + type: line[1], + size: parseInt(line[3], 10), + used: parseInt(line[3], 10) - parseInt(line[2], 10), + available: parseInt(line[2], 10), + use: parseFloat(((100.0 * (parseInt(line[3]) - parseInt(line[2]))) / parseInt(line[3])).toFixed(2)), + mount: line[0] + }); + } } }); if (callback) {