Add Description field parsing'

openscopeproject · Mar 5, 2021 · 034cde1 · 034cde1
1 parent 0195f14
commit 034cde1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/InteractiveHtmlBom/ecad/kicad_extra/netlistparser.py b/InteractiveHtmlBom/ecad/kicad_extra/netlistparser.py
@@ -20,19 +20,27 @@ def get_extra_field_data(self):
             ref = None
             fields = None
             datasheet = None
+            libsource = None
             for f in c[1:]:
                 if f[0] == 'ref':
                     ref = f[1]
                 if f[0] == 'fields':
                     fields = f[1:]
                 if f[0] == 'datasheet':
                     datasheet = f[1]
+                if f[0] == 'libsource':
+                    libsource = f[1:]
             if ref is None:
                 return None
             ref_fields = comp_dict.setdefault(ref, {})
             if datasheet and datasheet != '~':
-                field_set.add('datasheet')
-                ref_fields['datasheet'] = datasheet
+                field_set.add('Datasheet')
+                ref_fields['Datasheet'] = datasheet
+            if libsource is not None:
+                for lib_field in libsource:
+                    if lib_field[0] == 'description':
+                        field_set.add('Description')
+                        ref_fields['Description'] = lib_field[1]
             if fields is None:
                 continue
             for f in fields:

diff --git a/InteractiveHtmlBom/ecad/kicad_extra/parser_base.py b/InteractiveHtmlBom/ecad/kicad_extra/parser_base.py
@@ -1,5 +1,4 @@
 class ParserBase:
-    DEFAULT_FIELDS = []
 
     def __init__(self, file_name):
         """
@@ -29,7 +28,7 @@ def parse(self, normalize_case):
     def get_extra_field_data(self):
         # type: () -> tuple
         """
-        Parses the file and returns a extra field data.
+        Parses the file and returns extra field data.
         :return: tuple of the format
             (
                 [field_name1, field_name2,... ],

diff --git a/InteractiveHtmlBom/ecad/kicad_extra/xmlparser.py b/InteractiveHtmlBom/ecad/kicad_extra/xmlparser.py
@@ -23,12 +23,16 @@ def get_extra_field_data(self):
             if datasheet:
                 datasheet = self.get_text(datasheet[0].childNodes)
                 if datasheet != '~':
-                    field_set.add('datasheet')
-                    ref_fields['datasheet'] = datasheet
+                    field_set.add('Datasheet')
+                    ref_fields['Datasheet'] = datasheet
+            libsource = c.getElementsByTagName('libsource')
+            if libsource and libsource[0].hasAttribute('description'):
+                field_set.add('Description')
+                attr = libsource[0].attributes['description']
+                ref_fields['Description'] = attr.value
             for f in c.getElementsByTagName('field'):
                 name = f.attributes['name'].value
-                if name not in self.DEFAULT_FIELDS:
-                    field_set.add(name)
-                    ref_fields[name] = self.get_text(f.childNodes)
+                field_set.add(name)
+                ref_fields[name] = self.get_text(f.childNodes)
 
         return list(field_set), comp_dict