Skip to content

Fix DNP and variant fields being ignored with field case normalization #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qu1ck merged 2 commits into from
Oct 10, 2026
+17 −7
Merged

Fix DNP and variant fields being ignored with field case normalization #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa2359e
Fix DNP and variant fields being ignored with field case normalization
DominikPalo Oct 5, 2026
d23a4c3
Don't offer <empty> variant for components missing the field
DominikPalo Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions InteractiveHtmlBom/core/ibom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,30 @@ def skip_component(m, config):
if config.blacklist_virtual and m.attr == 'Virtual':
return True

dnp_field = config.dnp_field
variant_field = config.board_variant_field
if config.normalize_field_case:
# extra field names are lowercased when normalizing case
dnp_field = dnp_field and dnp_field.lower()
variant_field = variant_field and variant_field.lower()

# skip components with dnp field not empty
if config.dnp_field \
and config.dnp_field in m.extra_fields \
and m.extra_fields[config.dnp_field]:
if dnp_field \
and dnp_field in m.extra_fields \
and m.extra_fields[dnp_field]:
return True

# skip components with wrong variant field
empty_str = '<empty>'
if config.board_variant_field and config.board_variant_whitelist:
ref_variant = m.extra_fields.get(config.board_variant_field, '')
if variant_field and config.board_variant_whitelist:
ref_variant = m.extra_fields.get(variant_field, '')
if ref_variant == '':
ref_variant = empty_str
if ref_variant not in config.board_variant_whitelist:
return True

if config.board_variant_field and config.board_variant_blacklist:
ref_variant = m.extra_fields.get(config.board_variant_field, '')
if variant_field and config.board_variant_blacklist:
ref_variant = m.extra_fields.get(variant_field, '')
if ref_variant == '':
ref_variant = empty_str
if ref_variant != empty_str and ref_variant in config.board_variant_blacklist:
Expand Down
3 changes: 3 additions & 0 deletions InteractiveHtmlBom/dialog/settings_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,9 @@ def OnBoardVariantFieldChange(self, event):
self.boardVariantWhitelist.Clear()
self.boardVariantBlacklist.Clear()
return
if self.normalizeCaseCheckbox.Value:
# extra field names are lowercased when normalizing case
selection = selection.lower()
variant_set = set()
for _, field_dict in self.extra_field_data.fields_by_ref.items():
if selection in field_dict:
Expand Down
Loading