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

Make the BOM grouping function return string tuple for sorting

Browse Source
This commit is contained in:
KV 2020-11-27 21:15:59 +01:00
parent cdca708da9
commit f13f8a7dd7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wireviz/wv_bom.py
View File

@ -38,8 +38,8 @@ def get_additional_component_bom(component: Union[Connector, Cable]) -> List[dic
return bom_entries return bom_entries
def bom_types_group(entry: dict) -> Tuple[str, ...]: def bom_types_group(entry: dict) -> Tuple[str, ...]:
"""Return a tuple of 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."""
return tuple(entry.get(key) for key in ('item', 'unit', 'manufacturer', 'mpn', 'pn')) return tuple(make_str(entry.get(key)) for key in ('item', 'unit', 'manufacturer', 'mpn', 'pn'))
def generate_bom(harness): def generate_bom(harness):
from wireviz.Harness import Harness # Local import to avoid circular imports from wireviz.Harness import Harness # Local import to avoid circular imports
@ -100,12 +100,9 @@ def generate_bom(harness):
# remove line breaks if present and cleanup any resulting whitespace issues # remove line breaks if present and cleanup any resulting whitespace issues
bom_entries = [{k: clean_whitespace(v) for k, v in entry.items()} for entry in bom_entries] bom_entries = [{k: clean_whitespace(v) for k, v in entry.items()} for entry in bom_entries]
# Sort entries to prepare grouping on the same key function.
bom_entries.sort(key=lambda entry: tuple(attr or '' for attr in bom_types_group(entry)))
# deduplicate bom # deduplicate bom
bom = [] bom = []
for _, group in groupby(bom_entries, bom_types_group): for _, group in groupby(sorted(bom_entries, key=bom_types_group), key=bom_types_group):
last_entry = None last_entry = None
total_qty = 0 total_qty = 0
designators = [] designators = []