Add fabrication output directory to search list for netlist/xml

Fixes #102

Author: qu1ck

InteractiveHtmlBom/core/ibom.py

@@ -302,7 +302,7 @@ def save_config(dialog_panel):
     )
     try:
         config.netlist_initial_directory = os.path.dirname(parser.file_name)
-        extra_data_file = parser.latest_extra_data
+        extra_data_file = parser.latest_extra_data()
         if extra_data_file is not None:
             dlg.set_extra_data_path(extra_data_file)
         config.transfer_to_dialog(dlg.panel)

InteractiveHtmlBom/dialog_test.py

@@ -3,7 +3,7 @@
 
 class MyApp(wx.App):
     def OnInit(self):
-        frame = SettingsDialog(None, lambda x: None)
+        frame = SettingsDialog(lambda: None, lambda x: None, "Hi")
         if frame.ShowModal() == wx.ID_OK:
             print("Should generate bom")
         frame.Destroy()

InteractiveHtmlBom/ecad/common.py

@@ -13,7 +13,6 @@ def __init__(self, file_name, logger):
         self.file_name = file_name
         self.logger = logger
         self.extra_data_func = lambda f, b: ([], {})
-        self.latest_extra_data = None
 
     def parse(self):
         """
@@ -25,6 +24,14 @@ def parse(self):
         """
         pass
 
+    def latest_extra_data(self):
+        """
+        Abstract method that may be overridden in implementations that support
+        extra field data.
+        :return: File name of most recent file with extra field data.
+        """
+        return None
+
 
 class Component(object):
     """Simple data object to store component data needed for bom table."""

InteractiveHtmlBom/ecad/kicad.py

@@ -15,9 +15,22 @@ class PcbnewParser(EcadParser):
     def __init__(self, file_name, logger, board=None):
         super(PcbnewParser, self).__init__(file_name, logger)
         self.board = board
+        if self.board is None:
+            self.board = pcbnew.LoadBoard(self.file_name)  # type: pcbnew.BOARD
         self.font_parser = FontParser()
         self.extra_data_func = parse_schematic_data
-        self.latest_extra_data = find_latest_schematic_data(file_name)
+
+    def latest_extra_data(self):
+        base_name = os.path.splitext(os.path.basename(self.file_name))[0]
+        output_dir = self.board.GetPlotOptions().GetOutputDirectory()
+        file_dir_name = os.path.dirname(self.file_name)
+        if not os.path.isabs(output_dir):
+            output_dir = os.path.join(file_dir_name, output_dir)
+        directories = [
+            file_dir_name,
+            output_dir
+        ]
+        return find_latest_schematic_data(base_name, directories)
 
     @staticmethod
     def normalize(point):
@@ -344,8 +357,6 @@ def module_to_component(module):
                          attr)
 
     def parse(self):
-        if self.board is None:
-            self.board = pcbnew.LoadBoard(self.file_name)
         title_block = self.board.GetTitleBlock()
         file_date = title_block.GetDate()
         if not file_date:

InteractiveHtmlBom/ecad/kicad_extra/__init__.py

@@ -20,12 +20,20 @@ def parse_schematic_data(file_name, normalize_case):
         return parser.parse(normalize_case)
 
 
-def find_latest_schematic_data(pcb_file):
+def find_latest_schematic_data(base_name, directories):
     """
-    :param pcb_file: path to the pcb file
+    :param base_name: base name of pcb file
+    :param directories: list of directories to search
     :return: last modified parsable file path or None if not found
     """
-    dir = os.path.dirname(pcb_file)
+    for dir in directories:
+        f = _find_in_dir(base_name, dir)
+        if f:
+            return f
+    return None
+
+
+def _find_in_dir(base_name, dir):
     _, _, files = next(os.walk(dir), (None, None, []))
     # filter out files that we can not parse
     files = [f for f in files if os.path.splitext(f)[1] in PARSERS.keys()]
@@ -34,7 +42,6 @@ def find_latest_schematic_data(pcb_file):
     files = sorted(files, reverse=True)
     if files:
         # try to find first (last modified) file that has name matching pcb file
-        base_name = os.path.splitext(os.path.basename(pcb_file))[0]
         for _, f in files:
             if os.path.splitext(f)[0] == base_name:
                 return os.path.join(dir, f)