Merge pull request #152 from maxwroc/FixTooGreedyMatching

Fix greedy wildcard search
maxwroc · Oct 26, 2020 · b8ecec1 · b8ecec1
2 parents a2a57dc + 1033263
commit b8ecec1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "battery-state-card",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Battery State card for Home Assistant",
   "main": "dist/battery-state-card.js",
   "repository": {

diff --git a/src/battery-provider.ts b/src/battery-provider.ts
@@ -33,7 +33,7 @@ const operatorHandlers: { [key in FilterOperator]: (val: string | number | undef
             // create regexp after removing slashes
             exp = new RegExp(pattern.substr(1, pattern.length - 2));
         } else if (pattern.indexOf("*") != -1) {
-            exp = new RegExp(pattern.replace(/\*/g, ".*"));
+            exp = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$");
         }
 
         return exp ? exp.test(val.toString()) : val === pattern;

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,7 +1,7 @@
 import { HomeAssistant } from "./ha-types";
 
 console.info(
-    "%c BATTERY-STATE-CARD %c 1.5.1",
+    "%c BATTERY-STATE-CARD %c 1.5.2",
     "color: white; background: forestgreen; font-weight: 700;",
     "color: forestgreen; background: white; font-weight: 700;",
 );