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

initial schema build. need to figure out why deleting _state from output_line causes exceptions

Browse Source
This commit is contained in:
Kelly Brazil
2021-10-10 22:18:13 -07:00
parent 1bc638b6ee
commit a4f3306bae
1 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
jc/parsers/lsusb.py
View File

@ -126,10 +126,12 @@ class _LsUsb():
temp_obj['key']: { temp_obj['key']: {
'value': temp_obj['val'], 'value': temp_obj['val'],
'description': temp_obj['description'], 'description': temp_obj['description'],
'indent': indent, '_state': {
'bus_idx': self.bus_idx, 'indent': indent,
'interface_descriptor_idx': self.interface_descriptor_idx, 'bus_idx': self.bus_idx,
'endpoint_descriptor_idx': self.endpoint_descriptor_idx 'interface_descriptor_idx': self.interface_descriptor_idx,
'endpoint_descriptor_idx': self.endpoint_descriptor_idx
}
} }
} }
@ -157,11 +159,43 @@ class _LsUsb():
['bus']['hub_descriptor']['hub_port_status'] = {} ['bus']['hub_descriptor']['hub_port_status'] = {}
['bus']['device_status'] = {} ['bus']['device_status'] = {}
""" """
pass for idx, item in enumerate(self.bus_list):
# if self.output_line: if self.output_line:
# self.raw_output.append(self.output_line) self.raw_output.append(self.output_line)
# self.output_line = {} self.output_line = {}
self.output_line['bus'] = item
for dd in self.device_descriptor_list:
keyname = list(dd.keys()).copy()[0]
if dd[keyname]['_state']['bus_idx'] == idx:
if 'device_descriptor' not in self.output_line['bus']:
self.output_line['bus']['device_descriptor'] = {}
self.output_line['bus']['device_descriptor'].update(dd)
# del self.output_line['bus']['device_descriptor'][keyname]['_state']
for cd in self.configuration_descriptor_list:
keyname = list(cd.keys()).copy()[0]
if cd[keyname]['_state']['bus_idx'] == idx:
if 'configuration_descriptor' not in self.output_line['bus']['device_descriptor']:
self.output_line['bus']['device_descriptor']['configuration_descriptor'] = {}
self.output_line['bus']['device_descriptor']['configuration_descriptor'].update(cd)
# del self.output_line['bus']['device_descriptor']['configuration_descriptor'][keyname]['_state']
for ia in self.interface_association_list:
keyname = list(ia.keys()).copy()[0]
if ia[keyname]['_state']['bus_idx'] == idx:
if 'interface_association' not in self.output_line['bus']['device_descriptor']['configuration_descriptor']:
self.output_line['bus']['device_descriptor']['configuration_descriptor']['interface_association'] = {}
self.output_line['bus']['device_descriptor']['configuration_descriptor']['interface_association'].update(ia)
# del self.output_line['bus']['device_descriptor']['configuration_descriptor']['interface_association'][keyname]['_state']
for device in self.device_descriptor_list:
pass
for endpoint_descriptor_idx in self.endpoint_descriptor_list:
pass
def _set_sections(self, line): def _set_sections(self, line):
# ignore blank lines # ignore blank lines
@ -183,7 +217,9 @@ class _LsUsb():
'device': line_split[3][:-1], 'device': line_split[3][:-1],
'id': line_split[5], 'id': line_split[5],
'description': (line_split[6:7] or [None])[0], # way to get a list item or None 'description': (line_split[6:7] or [None])[0], # way to get a list item or None
'bus_idx': self.bus_idx '_state': {
'bus_idx': self.bus_idx
}
} }
) )
return True return True
@ -253,7 +289,9 @@ class _LsUsb():
'device_status': 'device_status':
{ {
'value': line_split[1].strip(), 'value': line_split[1].strip(),
'bus_idx': self.bus_idx '_state': {
'bus_idx': self.bus_idx
}
} }
} }
) )
@ -346,24 +384,27 @@ def parse(data, raw=False, quiet=False):
if s._populate_lists(line): if s._populate_lists(line):
continue continue
print(f''' # print(f'''
{s.section=} # {s.section=}
{s.bus_list=} # {s.bus_list=}
{s.device_descriptor_list=} # {s.device_descriptor_list=}
{s.configuration_descriptor_list=} # {s.configuration_descriptor_list=}
{s.interface_association_list=} # {s.interface_association_list=}
{s.interface_descriptor_list=} # {s.interface_descriptor_list=}
{s.cdc_header_list=} # {s.cdc_header_list=}
{s.cdc_call_management_list=} # {s.cdc_call_management_list=}
{s.cdc_acm_list=} # {s.cdc_acm_list=}
{s.cdc_union_list=} # {s.cdc_union_list=}
{s.endpoint_descriptor_list=} # {s.endpoint_descriptor_list=}
{s.hid_device_descriptor_list=} # {s.hid_device_descriptor_list=}
{s.report_descriptors_list=} # {s.report_descriptors_list=}
{s.hub_descriptor_list=} # {s.hub_descriptor_list=}
{s.hub_port_status_list=} # {s.hub_port_status_list=}
{s.device_status_list=} # {s.device_status_list=}
''') # ''')
# populate the schema
s._populate_schema()
# output the raw object # output the raw object
if s.output_line: if s.output_line: