Merge pull request #672 from maxwroc/FixFormtting

Fixed HA formatted state parsing
maxwroc · Feb 9, 2024 · 9324646 · 9324646
2 parents c76defb + 3ccc244
commit 9324646
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "battery-state-card",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "Battery State card for Home Assistant",
   "main": "dist/battery-state-card.js",
   "author": "Max Chodorowski",

diff --git a/src/entity-fields/battery-level.ts b/src/entity-fields/battery-level.ts
@@ -7,6 +7,12 @@ import { isNumber, log, toNumber } from "../utils";
  */
 const stringValuePattern = /\b([0-9]{1,3})\s?%/;
 
+
+/**
+ * HA formatted state pattern
+ */
+const formattedStatePattern = /(-?[0-9,.]+)\s?(.*)/;
+
 /**
  * Getts battery level/state
  * @param config Entity config
@@ -100,9 +106,11 @@ export const getBatteryLevel = (config: IBatteryEntityConfig, hass?: HomeAssista
     if (config.default_state_formatting !== false && !displayValue && state === entityData.state) {
         const formattedState = hass.formatEntityState(entityData);
 
-        // assuming it is a number followed by unit
-        [state, unit] = formattedState.split(" ", 2);
-        unit = unit;
+        const matches = formattedState.match(formattedStatePattern);
+        if (matches != null) {
+            state = matches[1];
+            unit = matches[2] || unit;
+        }
     }
 
     return {

diff --git a/test/other/entity-fields/battery-level.test.ts b/test/other/entity-fields/battery-level.test.ts
@@ -261,4 +261,24 @@ describe("Battery level", () => {
 
         expect(state).toBe("2");
     })
+
+    test.each([
+        ["55 %", { state: "55", level: 55, unit: "%" }],
+        ["66%", { state: "66", level: 66, unit: "%" }],
+        ["-77lqi", { state: "-77", level: -77, unit: "lqi" }],
+        ["-88.8lqi", { state: "-88.8", level: -88.8, unit: "lqi" }],
+        ["99", { state: "99", level: 99, unit: "%" }],
+    ])
+    ("default HA formatting - various formatted states", (formattedResult: string, expected: { state: string, level: number, unit?: string }) => {
+
+        const hassMock = new HomeAssistantMock(true);
+        hassMock.addEntity("Mocked entity", "45");
+        hassMock.mockFunc("formatEntityState", () => formattedResult);
+
+        const { state, level, unit } = getBatteryLevel({ entity: "mocked_entity" }, hassMock.hass);
+
+        expect(level).toBe(expected.level);
+        expect(state).toBe(expected.state);
+        expect(unit).toBe(expected.unit);
+    });
 });