Sort references intelligently

Fixes #274

Author: qu1ck

InteractiveHtmlBom/core/ibom.py

@@ -160,12 +160,12 @@ def natural_sort(lst):
 
     # sort table by reference prefix and quantity
     def row_sort_key(element):
-        prefix = re.findall('^[A-Z]*', element[0][0])[0]
+        prefix = re.findall('^[^0-9]*', element[0][0])[0]
         if prefix in config.component_sort_order:
             ref_ord = config.component_sort_order.index(prefix)
         else:
             ref_ord = config.component_sort_order.index('~')
-        return ref_ord, len(element), alphanum_key(element[0][0])
+        return ref_ord, -len(element), alphanum_key(element[0][0])
 
     if '~' not in config.component_sort_order:
         config.component_sort_order.append('~')

InteractiveHtmlBom/web/ibom.js

@@ -469,7 +469,23 @@ function populateBomHeader(placeHolderColumn = null, placeHolderElements = null)
       else return 0;
     }
   }
-
+  var referenceRegex = /(?<prefix>[^0-9]+)(?<number>[0-9]+)/;
+  var compareRefs = (a, b) => {
+    var ra = referenceRegex.exec(a);
+    var rb = referenceRegex.exec(b);
+    if (ra === null || rb === null) {
+      if (a != b) return a > b ? 1 : -1;
+      return 0;
+    } else {
+      if (ra.groups.prefix != rb.groups.prefix) {
+        return ra.groups.prefix > rb.groups.prefix ? 1 : -1;
+      }
+      if (ra.groups.number != rb.groups.number) {
+        return parseInt(ra.groups.number) > parseInt(rb.groups.number) ? 1 : -1;
+      }
+      return 0;
+    }
+  }
   if (settings.bommode == "netlist") {
     th = createColumnHeader("Net name", "bom-netname", (a, b) => {
       if (a > b) return -1;
@@ -502,7 +518,7 @@ function populateBomHeader(placeHolderColumn = null, placeHolderElements = null)
         tr.appendChild(createColumnHeader("References", "references", (a, b) => {
           var i = 0;
           while (i < a.length && i < b.length) {
-            if (a[i] != b[i]) return a[i] > b[i] ? 1 : -1;
+            if (a[i] != b[i]) return compareRefs(a[i][0], b[i][0]);
             i++;
           }
           return a.length - b.length;