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

users() improved date parsing (macOS)

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2025-01-02 13:40:42 +01:00
parent 8d1e037342
commit 0cc50fcac5
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/users.js
+11 -3
View File
@@ -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');