1
0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00

fix remove _state field during schema_populate

This commit is contained in:
Kelly Brazil
2021-10-11 07:48:23 -07:00
parent a4f3306bae
commit 9c1bb66452

View File

@ -168,28 +168,28 @@ class _LsUsb():
self.output_line['bus'] = item self.output_line['bus'] = item
for dd in self.device_descriptor_list: for dd in self.device_descriptor_list:
keyname = list(dd.keys()).copy()[0] keyname = list(dd.keys())[0]
if dd[keyname]['_state']['bus_idx'] == idx: if '_state' in dd[keyname] and dd[keyname]['_state']['bus_idx'] == idx:
if 'device_descriptor' not in self.output_line['bus']: if 'device_descriptor' not in self.output_line['bus']:
self.output_line['bus']['device_descriptor'] = {} self.output_line['bus']['device_descriptor'] = {}
self.output_line['bus']['device_descriptor'].update(dd) self.output_line['bus']['device_descriptor'].update(dd)
# del self.output_line['bus']['device_descriptor'][keyname]['_state'] del self.output_line['bus']['device_descriptor'][keyname]['_state']
for cd in self.configuration_descriptor_list: for cd in self.configuration_descriptor_list:
keyname = list(cd.keys()).copy()[0] keyname = list(cd.keys())[0]
if cd[keyname]['_state']['bus_idx'] == idx: if '_state' in cd[keyname] and cd[keyname]['_state']['bus_idx'] == idx:
if 'configuration_descriptor' not in self.output_line['bus']['device_descriptor']: 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'] = {}
self.output_line['bus']['device_descriptor']['configuration_descriptor'].update(cd) self.output_line['bus']['device_descriptor']['configuration_descriptor'].update(cd)
# del self.output_line['bus']['device_descriptor']['configuration_descriptor'][keyname]['_state'] del self.output_line['bus']['device_descriptor']['configuration_descriptor'][keyname]['_state']
for ia in self.interface_association_list: for ia in self.interface_association_list:
keyname = list(ia.keys()).copy()[0] keyname = list(ia.keys())[0]
if ia[keyname]['_state']['bus_idx'] == idx: if '_state' in ia[keyname] and ia[keyname]['_state']['bus_idx'] == idx:
if 'interface_association' not in self.output_line['bus']['device_descriptor']['configuration_descriptor']: 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'] = {}
self.output_line['bus']['device_descriptor']['configuration_descriptor']['interface_association'].update(ia) 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'] del self.output_line['bus']['device_descriptor']['configuration_descriptor']['interface_association'][keyname]['_state']
for device in self.device_descriptor_list: for device in self.device_descriptor_list:
pass pass