systeminformation 5.24.4 → 5.24.6

package/README.md

@@ -1186,7 +1186,7 @@ All other trademarks are the property of their respective owners.
 [daviddm-url]: https://david-dm.org/sebhildebrandt/systeminformation
 [issues-img]: https://img.shields.io/github/issues/sebhildebrandt/systeminformation.svg?style=flat-square
 [issues-url]: https://github.com/sebhildebrandt/systeminformation/issues
-[closed-issues-img]: https://img.shields.io/github/issues-closed-raw/sebhildebrandt/systeminformation.svg?style=flat-square&color=brightgreen
+[closed-issues-img]: https://img.shields.io/github/issues-search?query=repo%3Asebhildebrandt/systeminformation+is%3Aclosed&style=flat-square&color=brightgreen&label=Issues+closed
 [closed-issues-url]: https://github.com/sebhildebrandt/systeminformation/issues?q=is%3Aissue+is%3Aclosed
 [new-issue]: https://github.com/sebhildebrandt/systeminformation/issues/new/choose
 [mmon-npm-url]: https://npmjs.org/package/mmon

package/lib/cpu.js

@@ -737,6 +737,7 @@ function getCpu() {
             }
             modelline = util.getValue(lines, 'model name') || modelline;
             modelline = util.getValue(lines, 'bios model name') || modelline;
+            modelline = util.cleanString(modelline);
             const modellineParts = modelline.split('@');
             result.brand = modellineParts[0].trim();
             result.speed = modellineParts[1] ? parseFloat(modellineParts[1].trim()) : 0;

package/lib/users.js

@@ -105,10 +105,18 @@ function parseUsersDarwin(lines) {
 
       // who part
       if (is_whopart) {
+        let dt = ('' + new Date().getFullYear()) + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(l[2].toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + l[3]).slice(-2);
+        try {
+          if (new Date(dt) > new Date) {
+            dt = ('' + (new Date().getFullYear() - 1)) + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(l[2].toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + l[3]).slice(-2);
+          }
+        } catch {
+          util.noop();
+        }
         result_who.push({
           user: l[0],
           tty: l[1],
-          date: ('' + new Date().getFullYear()) + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(l[2].toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + l[3]).slice(-2),
+          date: dt,
           time: l[4],
         });
       } else {
@@ -146,7 +154,7 @@ function users(callback) {
 
       // linux
       if (_linux) {
-        exec('who --ips; echo "---"; w | tail -n +2', function (error, stdout) {
+        exec('export LC_ALL=C; who --ips; echo "---"; w; unset LC_ALL | tail -n +2', function (error, stdout) {
           if (!error) {
             // lines / split
             let lines = stdout.toString().split('\n');
@@ -195,7 +203,7 @@ function users(callback) {
       }
 
       if (_darwin) {
-        exec('who; echo "---"; w -ih', function (error, stdout) {
+        exec('export LC_ALL=C; who; echo "---"; w -ih; unset LC_ALL', function (error, stdout) {
           if (!error) {
             // lines / split
             let lines = stdout.toString().split('\n');

package/lib/util.js

@@ -2535,6 +2535,9 @@ function checkWebsite(url, timeout = 5000) {
   });
 };
 
+function cleanString(str) {
+  return str.replace(/To Be Filled By O.E.M./g, '');
+}
 function noop() { }
 
 exports.toInt = toInt;
@@ -2591,3 +2594,4 @@ exports.getFilesInPath = getFilesInPath;
 exports.semverCompare = semverCompare;
 exports.getAppleModel = getAppleModel;
 exports.checkWebsite = checkWebsite;
+exports.cleanString = cleanString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.24.4",
+  "version": "5.24.6",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",