warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename bom_types_group() to bom_entry_key()

Browse Source
This commit is contained in:
KV 2021-03-26 00:46:37 +01:00
parent f549988a19
commit 30a6b137a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wireviz/wv_bom.py
View File

@ -28,7 +28,7 @@ def get_additional_component_table(harness: "Harness", component: Union[Connecto
'unit': part.unit, 'unit': part.unit,
} }
if harness.mini_bom_mode: if harness.mini_bom_mode:
id = get_bom_index(harness.bom(), bom_types_group({**asdict(part), 'description': part.description})) id = get_bom_index(harness.bom(), bom_entry_key({**asdict(part), 'description': part.description}))
rows.append(component_table_entry(f'#{id} ({part.type.rstrip()})', **common_args)) rows.append(component_table_entry(f'#{id} ({part.type.rstrip()})', **common_args))
else: else:
rows.append(component_table_entry(part.description, **common_args, **optional_fields(part))) rows.append(component_table_entry(part.description, **common_args, **optional_fields(part)))
@ -47,7 +47,7 @@ def get_additional_component_bom(component: Union[Connector, Cable]) -> List[BOM
}) })
return bom_entries return bom_entries
def bom_types_group(entry: BOMEntry) -> BOMKey: def bom_entry_key(entry: BOMEntry) -> BOMKey:
"""Return a tuple of string values from the dict that must be equal to join BOM entries.""" """Return a tuple of string values from the dict that must be equal to join BOM entries."""
if 'key' not in entry: if 'key' not in entry:
entry['key'] = tuple(clean_whitespace(make_str(entry.get(k))) for k in ('description', 'unit', 'manufacturer', 'mpn', 'pn')) entry['key'] = tuple(clean_whitespace(make_str(entry.get(k))) for k in ('description', 'unit', 'manufacturer', 'mpn', 'pn'))
@ -111,7 +111,7 @@ def generate_bom(harness: "Harness") -> List[BOMEntry]:
# deduplicate bom # deduplicate bom
bom = [] bom = []
for _, group in groupby(sorted(bom_entries, key=bom_types_group), key=bom_types_group): for _, group in groupby(sorted(bom_entries, key=bom_entry_key), key=bom_entry_key):
group_entries = list(group) group_entries = list(group)
designators = sum((make_list(entry.get('designators')) for entry in group_entries), []) designators = sum((make_list(entry.get('designators')) for entry in group_entries), [])
total_qty = sum(entry.get('qty', 1) for entry in group_entries) total_qty = sum(entry.get('qty', 1) for entry in group_entries)
@ -123,7 +123,7 @@ def generate_bom(harness: "Harness") -> List[BOMEntry]:
def get_bom_index(bom: List[BOMEntry], target: BOMKey) -> int: def get_bom_index(bom: List[BOMEntry], target: BOMKey) -> int:
"""Return id of BOM entry or raise exception if not found.""" """Return id of BOM entry or raise exception if not found."""
for entry in bom: for entry in bom:
if bom_types_group(entry) == target: if bom_entry_key(entry) == target:
return entry['id'] return entry['id']
raise Exception('Internal error: No BOM entry found matching: ' + '|'.join(target)) raise Exception('Internal error: No BOM entry found matching: ' + '|'.join(target))