Fix handling empty string for board variant

Fixes #419

Author: qu1ck

InteractiveHtmlBom/core/config.py

@@ -163,7 +163,7 @@ def load_from_ini(self):
         if self.highlight_pin1 == '0':
             self.highlight_pin1 = 'none'
         if self.highlight_pin1 == '1':
-            self.highlight_pin1 == 'all'
+            self.highlight_pin1 = 'all'
 
     def save(self, locally):
         file = self.local_config_file if locally else self.global_config_file
@@ -421,10 +421,12 @@ def add_options(cls, parser, version):
                                  'variant for component.')
         parser.add_argument('--variants-whitelist', default='',
                             help='List of board variants to '
-                                 'include in the BOM.')
+                                 'include in the BOM. Use "<empty>" to denote '
+                                 'not set or empty value.')
         parser.add_argument('--variants-blacklist', default='',
                             help='List of board variants to '
-                                 'exclude from the BOM.')
+                                 'exclude from the BOM. Use "<empty>" to denote '
+                                 'not set or empty value.')
         parser.add_argument('--dnp-field', default=cls.dnp_field,
                             help='Name of the extra field that indicates '
                                  'do not populate status. Components with '

InteractiveHtmlBom/core/ibom.py

@@ -73,14 +73,19 @@ def skip_component(m, config):
         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 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 ref_variant and ref_variant in config.board_variant_blacklist:
+        if ref_variant == '':
+            ref_variant = empty_str
+        if ref_variant != empty_str and ref_variant in config.board_variant_blacklist:
             return True
 
     return False

InteractiveHtmlBom/dialog/settings_dialog.py

@@ -218,6 +218,7 @@ def OnSize(self, event):
 # Implementing FieldsPanelBase
 class FieldsPanel(dialog_base.FieldsPanelBase):
     NONE_STRING = '<none>'
+    EMPTY_STRING = '<empty>'
     FIELDS_GRID_COLUMNS = 3
 
     def __init__(self, parent, extra_data_func, extra_data_wildcard):
@@ -359,7 +360,10 @@ def OnBoardVariantFieldChange(self, event):
         variant_set = set()
         for _, field_dict in self.extra_field_data.fields_by_ref.items():
             if selection in field_dict:
-                variant_set.add(field_dict[selection])
+                v = field_dict[selection]
+                if v == "":
+                    v = self.EMPTY_STRING
+                variant_set.add(v)
         self.boardVariantWhitelist.SetItems(list(variant_set))
         self.boardVariantBlacklist.SetItems(list(variant_set))