Merge pull request #161 from maxwroc/vNext

Release 1.6.0

README.md

@@ -34,7 +34,8 @@ This card was inspired by [another great card](https://github.com/cbulock/lovela
 | Name | Type | Default | Since | Description |
 |:-----|:-----|:-----|:-----|:-----|
 | entity | string | **(required)** | v0.9.0 | Entity ID
-| name | string | | v0.9.0 | Entity name override
+| name | string |  | v0.9.0 | Entity name override
+| icon | string |  | v1.6.0 | Icon override (if you want to set a static custom one)
 | attribute | string | | v0.9.0 | Name of attribute (override) to extract the value from. By default we look for values in the following attributes: `battery_level`, `battery`. If they are not present we take entity state.
 | multiplier | number | `1` | v0.9.0 | If the value is not in 0-100 range we can adjust it by specifying multiplier. E.g. if the values are in 0-10 range you can make them working by putting `10` as multiplier.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "battery-state-card",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Battery State card for Home Assistant",
   "main": "dist/battery-state-card.js",
   "repository": {

src/battery-provider.ts

@@ -8,7 +8,9 @@ import { getBatteryCollections } from "./grouping";
 /**
  * Properties which should be copied over to individual entities from the card
  */
-const entititesGlobalProps = [ "tap_action", "state_map", "charging_state", "secondary_info", "color_thresholds", "color_gradient", "bulk_rename" ];
+const entititesGlobalProps = [ "tap_action", "state_map", "charging_state", "secondary_info", "color_thresholds", "color_gradient", "bulk_rename", "icon" ];
+
+const regExpPattern = /\/([^/]+)\/([igmsuy]*)/;
 
 /**
  * Functions to check if filter condition is met
@@ -29,9 +31,10 @@ const operatorHandlers: { [key in FilterOperator]: (val: string | number | undef
         pattern = pattern.toString();
 
         let exp: RegExp | undefined;
-        if (pattern[0] == "/" && pattern[pattern.length - 1] == "/") {
+        const regexpMatch = pattern.match(regExpPattern);
+        if (regexpMatch) {
             // create regexp after removing slashes
-            exp = new RegExp(pattern.substr(1, pattern.length - 2));
+            exp = new RegExp(regexpMatch[1], regexpMatch[2]);
         } else if (pattern.indexOf("*") != -1) {
             exp = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$");
         }

src/battery-vm.ts

@@ -150,6 +150,10 @@ class BatteryViewModel {
      */
     get icon(): string {
 
+        if (this.config.icon) {
+            return this.config.icon;
+        }
+
         const level = Number(this._level);
 
         if (this.charging && this.config.charging_state?.icon) {

src/types.ts

@@ -154,6 +154,11 @@ export interface IBatteryEntity {
      */
     name?: string;
 
+    /**
+     * Icon override
+     */
+    icon?: string;
+
     /**
      * Attribute name to extract batterly level from
      */

src/utils.ts

@@ -1,7 +1,7 @@
 import { HomeAssistant } from "./ha-types";
 
 console.info(
-    "%c BATTERY-STATE-CARD %c 1.5.2",
+    "%c BATTERY-STATE-CARD %c 1.6.0",
     "color: white; background: forestgreen; font-weight: 700;",
     "color: forestgreen; background: white; font-weight: 700;",
 );