python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-07-13 01:20:24 +02:00
Code Issues Releases Activity

add idle time fields to finger parser

Browse Source
This commit is contained in:
Kelly Brazil
2021-04-06 10:51:41 -07:00
parent 7b29c464b7
commit 417b70020a
5 changed files with 129 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
EXAMPLES.md
View File

@ -960,9 +960,14 @@ finger | jc --finger -p # or: jc -p finger
{ {
"login": "jdoe", "login": "jdoe",
"name": "John Doe", "name": "John Doe",
"tty": "*tty1", "tty": "tty1",
"idle": "13d", "idle": "14d",
"login_time": "Mar 22 21:14" "login_time": "Mar 22 21:14",
"tty_writeable": false,
"idle_minutes": 0,
"idle_hours": 0,
"idle_days": 14,
"total_idle_minutes": 20160
}, },
{ {
"login": "jdoe", "login": "jdoe",
@ -970,7 +975,12 @@ finger | jc --finger -p # or: jc -p finger
"tty": "pts/0", "tty": "pts/0",
"idle": null, "idle": null,
"login_time": "Apr 5 15:33", "login_time": "Apr 5 15:33",
"details": "(192.168.1.22)" "details": "(192.168.1.22)",
"tty_writeable": true,
"idle_minutes": 0,
"idle_hours": 0,
"idle_days": 0,
"total_idle_minutes": 0
} }
] ]
``` ```

41
docs/parsers/finger.md
View File

@ -24,12 +24,42 @@ Compatibility:
Examples: Examples:
$ finger | jc --finger -p $ finger | jc --finger -p
[
{
"login": "jdoe",
"name": "John Doe",
"tty": "tty1",
"idle": "14d",
"login_time": "Mar 22 21:14",
"tty_writeable": false,
"idle_minutes": 0,
"idle_hours": 0,
"idle_days": 14,
"total_idle_minutes": 20160
},
{
"login": "jdoe",
"name": "John Doe",
"tty": "pts/0",
"idle": null,
"login_time": "Apr 5 15:33",
"details": "(192.168.1.22)",
"tty_writeable": true,
"idle_minutes": 0,
"idle_hours": 0,
"idle_days": 0,
"total_idle_minutes": 0
},
...
]
$ finger | jc --finger -p -r
[ [
{ {
"login": "jdoe", "login": "jdoe",
"name": "John Doe", "name": "John Doe",
"tty": "*tty1", "tty": "*tty1",
"idle": "13d", "idle": "14d",
"login_time": "Mar 22 21:14" "login_time": "Mar 22 21:14"
}, },
{ {
@ -39,7 +69,8 @@ Examples:
"idle": null, "idle": null,
"login_time": "Apr 5 15:33", "login_time": "Apr 5 15:33",
"details": "(192.168.1.22)" "details": "(192.168.1.22)"
} },
...
] ]
@ -72,7 +103,11 @@ Returns:
"idle": string, # null if empty "idle": string, # null if empty
"login_time": string, "login_time": string,
"details": string, "details": string,
"tty_writeable": boolean "tty_writeable": boolean,
"idle_minutes": integer,
"idle_hours": integer,
"idle_days": integer,
"total_idle_minutes": integer
} }
] ]

59
jc/parsers/finger.py
View File

@ -22,12 +22,42 @@ Compatibility:
Examples: Examples:
$ finger | jc --finger -p $ finger | jc --finger -p
[
{
"login": "jdoe",
"name": "John Doe",
"tty": "tty1",
"idle": "14d",
"login_time": "Mar 22 21:14",
"tty_writeable": false,
"idle_minutes": 0,
"idle_hours": 0,
"idle_days": 14,
"total_idle_minutes": 20160
},
{
"login": "jdoe",
"name": "John Doe",
"tty": "pts/0",
"idle": null,
"login_time": "Apr 5 15:33",
"details": "(192.168.1.22)",
"tty_writeable": true,
"idle_minutes": 0,
"idle_hours": 0,
"idle_days": 0,
"total_idle_minutes": 0
},
...
]
$ finger | jc --finger -p -r
[ [
{ {
"login": "jdoe", "login": "jdoe",
"name": "John Doe", "name": "John Doe",
"tty": "*tty1", "tty": "*tty1",
"idle": "13d", "idle": "14d",
"login_time": "Mar 22 21:14" "login_time": "Mar 22 21:14"
}, },
{ {
@ -37,7 +67,8 @@ Examples:
"idle": null, "idle": null,
"login_time": "Apr 5 15:33", "login_time": "Apr 5 15:33",
"details": "(192.168.1.22)" "details": "(192.168.1.22)"
} },
...
] ]
""" """
import re import re
@ -80,7 +111,11 @@ def process(proc_data):
"idle": string, # null if empty "idle": string, # null if empty
"login_time": string, "login_time": string,
"details": string, "details": string,
"tty_writeable": boolean "tty_writeable": boolean,
"idle_minutes": integer,
"idle_hours": integer,
"idle_days": integer,
"total_idle_minutes": integer
} }
] ]
""" """
@ -92,9 +127,27 @@ def process(proc_data):
entry['tty_writeable'] = False entry['tty_writeable'] = False
if 'idle' in entry: if 'idle' in entry:
entry['idle_minutes'] = 0
entry['idle_hours'] = 0
entry['idle_days'] = 0
if entry['idle'] == '-': if entry['idle'] == '-':
entry['idle'] = None entry['idle'] = None
if entry['idle'] and entry['idle'].isnumeric():
entry['idle_minutes'] = int(entry['idle'])
if entry['idle'] and ':' in entry['idle']:
entry['idle_hours'] = int(entry['idle'].split(':')[0])
entry['idle_minutes'] = int(entry['idle'].split(':')[1])
if entry['idle'] and 'd' in entry['idle']:
entry['idle_days'] = int(entry['idle'].replace('d', ''))
entry['total_idle_minutes'] = (entry['idle_days'] * 1440) + \
(entry['idle_hours'] * 60) + \
entry['idle_minutes']
return proc_data return proc_data

1
tests/fixtures/ubuntu-18.04/finger.json vendored Normal file
View File

@ -0,0 +1 @@
[{"login":"kbrazil","name":"Kelly Brazil","tty":"tty1","idle":"14d","login_time":"Mar 22 21:14","tty_writeable":false,"idle_minutes":0,"idle_hours":0,"idle_days":14,"total_idle_minutes":20160},{"login":"kbrazil","name":"Kelly Brazil","tty":"pts/0","idle":null,"login_time":"Apr 5 15:33","details":"(192.168.1.22)","tty_writeable":true,"idle_minutes":0,"idle_hours":0,"idle_days":0,"total_idle_minutes":0},{"login":"kbrazil","name":"Kelly Brazil","tty":"pts/1","idle":"1:00","login_time":"Apr 6 09:04","details":"(192.168.1.22)","tty_writeable":true,"idle_minutes":0,"idle_hours":1,"idle_days":0,"total_idle_minutes":60},{"login":"kbrazil","name":"Kelly Brazil","tty":"pts/0","idle":"14","login_time":"Apr 5 12:30","tty_writeable":true,"idle_minutes":14,"idle_hours":0,"idle_days":0,"total_idle_minutes":14},{"login":"kbrazil","name":"Kelly Brazil","tty":"pts/0","idle":"14","login_time":"Apr 5 2020","tty_writeable":true,"idle_minutes":14,"idle_hours":0,"idle_days":0,"total_idle_minutes":14},{"login":"kbrazil","name":"Kelly Brazil","tty":"pts/0","idle":"14","login_time":"Apr 5 2021","details":"(192.168.1.23)","tty_writeable":true,"idle_minutes":14,"idle_hours":0,"idle_days":0,"total_idle_minutes":14},{"login":"kbrazil","name":"Kelly Brazil","tty":"pts/1","idle":"1:00","login_time":"Apr 6 09:04","details":"(192.168.1.22) other details","tty_writeable":true,"idle_minutes":0,"idle_hours":1,"idle_days":0,"total_idle_minutes":60}]

8
tests/fixtures/ubuntu-18.04/finger.out vendored Normal file
View File

@ -0,0 +1,8 @@
Login Name Tty Idle Login Time Office Office Phone
kbrazil Kelly Brazil *tty1 14d Mar 22 21:14
kbrazil Kelly Brazil pts/0 Apr 5 15:33 (192.168.1.22)
kbrazil Kelly Brazil pts/1 1:00 Apr 6 09:04 (192.168.1.22)
kbrazil Kelly Brazil pts/0 14 Apr 5 12:30
kbrazil Kelly Brazil pts/0 14 Apr 5 2020
kbrazil Kelly Brazil pts/0 14 Apr 5 2021 (192.168.1.23)
kbrazil Kelly Brazil pts/1 1:00 Apr 6 09:04 (192.168.1.22) other details