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

prefix ids with underscores for easier querying with jq, etc.

This commit is contained in:
Kelly Brazil
2022-10-10 11:37:33 -07:00
parent 3dfa4a1bbc
commit 50d3bda3b7

View File

@ -129,20 +129,20 @@ def parse(
raw_output['vendors'][vendor_id] = vdc_obj[vendor_id] raw_output['vendors'][vendor_id] = vdc_obj[vendor_id]
vdc_obj = {} vdc_obj = {}
vendor_id = vdc_header.groupdict()['vendor_id'] vendor_id = '_' + vdc_header.groupdict()['vendor_id']
vdc_obj[vendor_id] = {} vdc_obj[vendor_id] = {}
vdc_obj[vendor_id]['vendor_name'] = vdc_header.groupdict()['vendor_name'] vdc_obj[vendor_id]['vendor_name'] = vdc_header.groupdict()['vendor_name']
continue continue
if vdc_device: if vdc_device:
device_id = vdc_device.groupdict()['device_id'] device_id = '_' + vdc_device.groupdict()['device_id']
vdc_obj[vendor_id][device_id] = {} vdc_obj[vendor_id][device_id] = {}
vdc_obj[vendor_id][device_id]['device_name'] = vdc_device.groupdict()['device_name'] vdc_obj[vendor_id][device_id]['device_name'] = vdc_device.groupdict()['device_name']
continue continue
if vdc_subvendor: if vdc_subvendor:
subvendor = vdc_subvendor.groupdict()['subvendor'] subvendor = '_' + vdc_subvendor.groupdict()['subvendor']
subdevice = vdc_subvendor.groupdict()['subdevice'] subdevice = '_' + vdc_subvendor.groupdict()['subdevice']
vdc_obj[vendor_id][device_id][subvendor] = {} vdc_obj[vendor_id][device_id][subvendor] = {}
vdc_obj[vendor_id][device_id][subvendor][subdevice] = {} vdc_obj[vendor_id][device_id][subvendor][subdevice] = {}
vdc_obj[vendor_id][device_id][subvendor][subdevice]['subsystem_name'] = vdc_subvendor.groupdict()['subsystem_name'] vdc_obj[vendor_id][device_id][subvendor][subdevice]['subsystem_name'] = vdc_subvendor.groupdict()['subsystem_name']
@ -164,19 +164,19 @@ def parse(
raw_output['classes'][class_id] = class_obj[class_id] raw_output['classes'][class_id] = class_obj[class_id]
class_obj = {} class_obj = {}
class_id = class_header.groupdict()['class_id'] class_id = '_' + class_header.groupdict()['class_id']
class_obj[class_id] = {} class_obj[class_id] = {}
class_obj[class_id]['class_name'] = class_header.groupdict()['class_name'] class_obj[class_id]['class_name'] = class_header.groupdict()['class_name']
continue continue
if class_sub: if class_sub:
subclass_id = class_sub.groupdict()['subclass_id'] subclass_id = '_' + class_sub.groupdict()['subclass_id']
class_obj[class_id][subclass_id] = {} class_obj[class_id][subclass_id] = {}
class_obj[class_id][subclass_id]['subclass_name'] = class_sub.groupdict()['subclass_name'] class_obj[class_id][subclass_id]['subclass_name'] = class_sub.groupdict()['subclass_name']
continue continue
if class_progif: if class_progif:
prog_if_id = class_progif.groupdict()['prog_if_id'] prog_if_id = '_' + class_progif.groupdict()['prog_if_id']
class_obj[class_id][subclass_id][prog_if_id] = class_progif.groupdict()['prog_if_name'] class_obj[class_id][subclass_id][prog_if_id] = class_progif.groupdict()['prog_if_name']
continue continue