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 MAJ:MIN key to MAJ_MIN

Browse Source
This commit is contained in:
Kelly Brazil
2019-10-25 09:54:42 -07:00
parent 4fa88c1ba3
commit b3996cb4df
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -650,7 +650,7 @@ $ lsblk | jc --lsblk -p
[
{
"NAME": "loop0",
"MAJ:MIN": "7:0",
"MAJ_MIN": "7:0",
"RM": "0",
"SIZE": "54.5M",
"RO": "1",
@ -659,7 +659,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sda",
"MAJ:MIN": "8:0",
"MAJ_MIN": "8:0",
"RM": "0",
"SIZE": "20G",
"RO": "0",
@ -667,7 +667,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sda1",
"MAJ:MIN": "8:1",
"MAJ_MIN": "8:1",
"RM": "0",
"SIZE": "1M",
"RO": "0",
@ -675,7 +675,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sda2",
"MAJ:MIN": "8:2",
"MAJ_MIN": "8:2",
"RM": "0",
"SIZE": "20G",
"RO": "0",
@ -684,7 +684,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sr0",
"MAJ:MIN": "11:0",
"MAJ_MIN": "11:0",
"RM": "1",
"SIZE": "64.8M",
"RO": "0",

14
jc/parsers/lsblk.py
View File

@ -9,7 +9,7 @@ $ lsblk | jc --lsblk -p
[
{
"NAME": "loop0",
"MAJ:MIN": "7:0",
"MAJ_MIN": "7:0",
"RM": "0",
"SIZE": "54.5M",
"RO": "1",
@ -18,7 +18,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sda",
"MAJ:MIN": "8:0",
"MAJ_MIN": "8:0",
"RM": "0",
"SIZE": "20G",
"RO": "0",
@ -26,7 +26,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sda1",
"MAJ:MIN": "8:1",
"MAJ_MIN": "8:1",
"RM": "0",
"SIZE": "1M",
"RO": "0",
@ -34,7 +34,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sda2",
"MAJ:MIN": "8:2",
"MAJ_MIN": "8:2",
"RM": "0",
"SIZE": "20G",
"RO": "0",
@ -43,7 +43,7 @@ $ lsblk | jc --lsblk -p
},
{
"NAME": "sr0",
"MAJ:MIN": "11:0",
"MAJ_MIN": "11:0",
"RM": "1",
"SIZE": "64.8M",
"RO": "0",
@ -61,6 +61,10 @@ def parse(data):
cleandata = data.splitlines()
headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h]
# clean up 'MAJ:MIN' header
# even though colon in a key is valid json, it can make things difficult
headers = ['MAJ_MIN' if x == 'MAJ:MIN' else x for x in headers]
raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:])
output = [dict(zip(headers, r)) for r in raw_data]