python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-17 00:07:37 +02:00
Code Issues Releases Activity

change LOGIN@ to LOGIN_AT

Browse Source
This commit is contained in:
Kelly Brazil
2019-10-25 10:22:10 -07:00
parent a07d9a0e4b
commit 57d0ab2ed7
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1097,7 +1097,7 @@ $ w | jc --w -p
"USER": "root", "USER": "root",
"TTY": "ttyS0", "TTY": "ttyS0",
"FROM": "-", "FROM": "-",
"LOGIN@": "Mon20", "LOGIN_AT": "Mon20",
"IDLE": "2:27", "IDLE": "2:27",
"JCPU": "10.61s", "JCPU": "10.61s",
"PCPU": "10.53s", "PCPU": "10.53s",
@ -1107,7 +1107,7 @@ $ w | jc --w -p
"USER": "root", "USER": "root",
"TTY": "pts/0", "TTY": "pts/0",
"FROM": "192.168.71.1", "FROM": "192.168.71.1",
"LOGIN@": "22:58", "LOGIN_AT": "22:58",
"IDLE": "2.00s", "IDLE": "2.00s",
"JCPU": "0.04s", "JCPU": "0.04s",
"PCPU": "0.00s", "PCPU": "0.00s",

9
jc/parsers/w.py
View File

@ -11,7 +11,7 @@ $ w | jc --w -p
"USER": "root", "USER": "root",
"TTY": "ttyS0", "TTY": "ttyS0",
"FROM": "-", "FROM": "-",
"LOGIN@": "Mon20", "LOGIN_AT": "Mon20",
"IDLE": "2:27", "IDLE": "2:27",
"JCPU": "10.61s", "JCPU": "10.61s",
"PCPU": "10.53s", "PCPU": "10.53s",
@ -21,7 +21,7 @@ $ w | jc --w -p
"USER": "root", "USER": "root",
"TTY": "pts/0", "TTY": "pts/0",
"FROM": "192.168.71.1", "FROM": "192.168.71.1",
"LOGIN@": "22:58", "LOGIN_AT": "22:58",
"IDLE": "2.00s", "IDLE": "2.00s",
"JCPU": "0.04s", "JCPU": "0.04s",
"PCPU": "0.00s", "PCPU": "0.00s",
@ -38,5 +38,10 @@ def parse(data):
cleandata = data.splitlines()[1:] cleandata = data.splitlines()[1:]
headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h] headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h]
# clean up 'LOGIN@' header
# even though @ in a key is valid json, it can make things difficult
headers = ['LOGIN_AT' if x == 'LOGIN@' else x for x in headers]
raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:]) raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:])
return [dict(zip(headers, r)) for r in raw_data] return [dict(zip(headers, r)) for r in raw_data]