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

device_status working

Browse Source
This commit is contained in:
Kelly Brazil
2021-10-21 16:59:28 -07:00
parent 2057817ef8
commit 9e7b1621cf
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jc/parsers/lsusb.py
View File

@ -242,7 +242,13 @@ class _LsUsb():
# } # }
def _add_device_status_attributes(self, line): def _add_device_status_attributes(self, line):
return self._add_attributes(line) return {
'description': line.strip(),
'_state': {
'bus_idx': self.bus_idx
}
}
def _set_sections(self, line): def _set_sections(self, line):
# ignore blank lines # ignore blank lines
@ -288,15 +294,12 @@ class _LsUsb():
self.section = 'device_status' self.section = 'device_status'
line_split = line.strip().split(':', maxsplit=1) line_split = line.strip().split(':', maxsplit=1)
self.device_status_list.append( self.device_status_list.append(
{
'device_status':
{ {
'value': line_split[1].strip(), 'value': line_split[1].strip(),
'_state': { '_state': {
'bus_idx': self.bus_idx 'bus_idx': self.bus_idx
} }
} }
}
) )
return True return True
@ -333,8 +336,7 @@ class _LsUsb():
'hid_device_descriptor': self.hid_device_descriptor_list, 'hid_device_descriptor': self.hid_device_descriptor_list,
'report_descriptors': self.report_descriptors_list, 'report_descriptors': self.report_descriptors_list,
'endpoint_descriptor': self.endpoint_descriptor_list, 'endpoint_descriptor': self.endpoint_descriptor_list,
'hub_descriptor': self.hub_descriptor_list, 'hub_descriptor': self.hub_descriptor_list
'device_status': self.device_status_list
} }
for sec in section_list_map.keys(): for sec in section_list_map.keys():
@ -403,7 +405,6 @@ class _LsUsb():
for iface_attrs in self.interface_descriptor_list: for iface_attrs in self.interface_descriptor_list:
keyname = tuple(iface_attrs.keys())[0] keyname = tuple(iface_attrs.keys())[0]
if '_state' in iface_attrs[keyname] and iface_attrs[keyname]['_state']['bus_idx'] == idx: if '_state' in iface_attrs[keyname] and iface_attrs[keyname]['_state']['bus_idx'] == idx:
if 'interface_descriptors' not in self.output_line['device_descriptor']['configuration_descriptor']:
self.output_line['device_descriptor']['configuration_descriptor']['interface_descriptors'] = [] self.output_line['device_descriptor']['configuration_descriptor']['interface_descriptors'] = []
# find max index for this bus idx, then iterate over that range # find max index for this bus idx, then iterate over that range
@ -464,7 +465,6 @@ class _LsUsb():
for endpoint_attrs in self.endpoint_descriptor_list: for endpoint_attrs in self.endpoint_descriptor_list:
keyname = tuple(endpoint_attrs.keys())[0] keyname = tuple(endpoint_attrs.keys())[0]
if '_state' in endpoint_attrs[keyname] and endpoint_attrs[keyname]['_state']['bus_idx'] == idx and endpoint_attrs[keyname]['_state']['interface_descriptor_idx'] == iface_idx: if '_state' in endpoint_attrs[keyname] and endpoint_attrs[keyname]['_state']['bus_idx'] == idx and endpoint_attrs[keyname]['_state']['interface_descriptor_idx'] == iface_idx:
if 'endpoint_descriptors' not in i_desc_obj:
i_desc_obj['endpoint_descriptors'] = [] i_desc_obj['endpoint_descriptors'] = []
# find max index for this endpoint_descriptor idx, then iterate over that range # find max index for this endpoint_descriptor idx, then iterate over that range
@ -481,8 +481,8 @@ class _LsUsb():
for endpoint_attrs in self.endpoint_descriptor_list: for endpoint_attrs in self.endpoint_descriptor_list:
keyname = tuple(endpoint_attrs.keys())[0] keyname = tuple(endpoint_attrs.keys())[0]
if '_state' in endpoint_attrs[keyname] and endpoint_attrs[keyname]['_state']['bus_idx'] == idx and endpoint_attrs[keyname]['_state']['interface_descriptor_idx'] == iface_idx and endpoint_attrs[keyname]['_state']['endpoint_descriptor_idx'] == endpoint_idx: if '_state' in endpoint_attrs[keyname] and endpoint_attrs[keyname]['_state']['bus_idx'] == idx and endpoint_attrs[keyname]['_state']['interface_descriptor_idx'] == iface_idx and endpoint_attrs[keyname]['_state']['endpoint_descriptor_idx'] == endpoint_idx:
del endpoint_attrs[keyname]['_state']
e_desc_obj.update(endpoint_attrs) e_desc_obj.update(endpoint_attrs)
del endpoint_attrs[keyname]['_state']
i_desc_obj['endpoint_descriptors'].append(e_desc_obj) i_desc_obj['endpoint_descriptors'].append(e_desc_obj)
@ -503,9 +503,9 @@ class _LsUsb():
for ds in self.device_status_list: for ds in self.device_status_list:
keyname = tuple(ds.keys())[0] keyname = tuple(ds.keys())[0]
if '_state' in ds[keyname] and ds[keyname]['_state']['bus_idx'] == idx: if '_state' in ds and ds['_state']['bus_idx'] == idx:
self.output_line['device_status'].update(ds) self.output_line['device_status'].update(ds)
del self.output_line['device_status'][keyname]['_state'] del self.output_line['device_status']['_state']
def parse(data, raw=False, quiet=False): def parse(data, raw=False, quiet=False):