fix: fixed #206, incorrectly escaping backslashes in regex

ActivityWatch · Jun 10, 2020 · 554d05a · 554d05a
1 parent f9bcaed
commit 554d05a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/queries.ts b/src/queries.ts
@@ -51,11 +51,15 @@ export function appQuery(
     classes: classes,
     filter_afk: filterAFK,
   };
+
+  // Needs escaping for regex patterns like '\w' to work (JSON.stringify adds extra unecessary escaping)
+  const classes_str = JSON.stringify(params.classes).replace('\\\\', '\\');
+
   const code =
     `
     events = query_bucket("${params.bid_android}");
     events = merge_events_by_keys(events, ["app"]);
-    events = categorize(events, ${JSON.stringify(params.classes)});` +
+    events = categorize(events, ${classes_str});` +
     (filterCategories
       ? `events = filter_keyvals(events, "$category", ${JSON.stringify(filterCategories)});`
       : '') +
@@ -153,10 +157,13 @@ export function fullDesktopQuery(
     filter_afk: filterAFK,
   };
 
+  // Needs escaping for regex patterns like '\w' to work (JSON.stringify adds extra unecessary escaping)
+  const classes_str = JSON.stringify(params.classes).replace('\\\\', '\\');
+
   return querystr_to_array(
     `
     ${canonicalEvents(params)}
-    events = categorize(events, ${JSON.stringify(params.classes)});
+    events = categorize(events, ${classes_str});
     ` +
     (filterCategories
       ? `events = filter_keyvals(events, "$category", ${JSON.stringify(filterCategories)});`