Prioritize files with matching names when picking netlist/xml

Author: qu1ck

InteractiveHtmlBom/dialog/settings_dialog.py

@@ -26,7 +26,6 @@ def SetSizeHints(self, sz1, sz2):
         self.SetSizeHintsSz(sz1, sz2)
 
     def set_extra_data_path(self, extra_data_file):
-        print extra_data_file
         self.panel.extra.netlistFilePicker.Path = extra_data_file
         wx.CallAfter(self.panel.extra.OnNetlistFileChanged, None)
 

InteractiveHtmlBom/generate_interactive_bom.py

@@ -529,10 +529,6 @@ def get_file_content(file_name):
 def main(pcb, config):
     # type: (pcbnew.BOARD, Config) -> None
     pcb_file_name = pcb.GetFileName()
-    if not pcb_file_name:
-        logerror('Please save the board file before generating BOM.')
-        return
-
     # Get extra field data
     extra_fields = None
     if config.netlist_file and os.path.isfile(config.netlist_file):
@@ -620,12 +616,15 @@ def defaults(self):
 
     def Run(self):
         config = Config()
+        pcb_file_name = pcbnew.GetBoard().GetFileName()
+        if not pcb_file_name:
+            logerror('Please save the board file before generating BOM.')
+            return
+
         dlg = dialog.SettingsDialog(None, extra_data_func=parse_schematic_data)
         try:
-            config.netlist_initial_directory = os.path.dirname(
-                    pcbnew.GetBoard().GetFileName())
-            extra_data_file = find_latest_schematic_data(
-                    config.netlist_initial_directory)
+            config.netlist_initial_directory = os.path.dirname(pcb_file_name)
+            extra_data_file = find_latest_schematic_data(pcb_file_name)
             if extra_data_file is not None:
                 dlg.set_extra_data_path(extra_data_file)
             config.transfer_to_dialog(dlg.panel)

InteractiveHtmlBom/schematic_data/__init__.py

@@ -20,18 +20,25 @@ def parse_schematic_data(file_name):
         return parser.get_extra_field_data()
 
 
-def find_latest_schematic_data(dir):
+def find_latest_schematic_data(pcb_file):
     """
-    :param dir: directory of the pcb file
+    :param pcb_file: path to the pcb file
     :return: last modified parsable file path or None if not found
     """
+    dir = os.path.dirname(pcb_file)
     _, _, files = next(os.walk(dir), (None, None, []))
-    # filter out files that we can parse
+    # filter out files that we can not parse
     files = [f for f in files if os.path.splitext(f)[1] in PARSERS.keys()]
-    # get their mtime and pick the latest one
+    # get their modification time and sort in descending order
     files = [(os.path.getmtime(os.path.join(dir, f)), f) for f in files]
-    print files
+    files = sorted(files, reverse=True)
     if files:
-        return os.path.join(dir, sorted(files, reverse=True)[0][1])
+        # 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)
+        # if no such file is found just return last modified
+        return os.path.join(dir, files[0][1])
     else:
         return None