Fix filtering options (fixes #23)

Heath123 · Apr 13, 2021 · 888ae16 · 888ae16
1 parent 4906787
commit 888ae16
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/html/mainPage/js/filteringLogic.js b/html/mainPage/js/filteringLogic.js
@@ -9,6 +9,15 @@ exports.packetFilteredByFilterBox = function (packet, filter, hiddenPackets, inv
 
   const comparisonString = packet.hexIdString + ' ' + packet.meta.name + ' ' + JSON.stringify(packet.data)
 
+  if (regexFilter && typeof filter === 'string') {
+    try {
+      filter = new RegExp(sharedVars.lastFilter)
+    } catch (err) {
+      // TODO: handle
+      filter = new RegExp("")
+    }
+  }
+
   let result
   if (regexFilter) {
     result = filter.test(comparisonString)

diff --git a/html/mainPage/js/packetDom.js b/html/mainPage/js/packetDom.js
@@ -37,7 +37,9 @@ function formatTime (ms) {
 }
 
 exports.addPacketToDOM = function (packet) {
-  const isHidden = filteringLogic.packetFilteredByFilterBox(packet, sharedVars.lastFilter, sharedVars.hiddenPackets)
+  const isHidden = filteringLogic.packetFilteredByFilterBox(packet, sharedVars.lastFilter, sharedVars.hiddenPackets,
+    // TODO: cache these?
+    sharedVars.settings.getSetting('inverseFiltering'), sharedVars.settings.getSetting('regexFilter'))
   sharedVars.allPacketsHTML.push([
     `<li id="packet${packet.uid}" onclick="packetClick(${packet.uid})" class="packet ${packet.direction} ${isHidden ? 'filter-hidden' : 'filter-shown'}">
         <div class="main-data">