Change firmware endpoint and handle non-SemVer firware (#324)

travisghansen · Nov 25, 2024 · 299f508 · 299f508
1 parent 8e34e9f
commit 299f508
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/custom_components/opnsense/pyopnsense/__init__.py b/custom_components/opnsense/pyopnsense/__init__.py
@@ -258,12 +258,22 @@ async def _exec_php(self, script) -> Mapping[str, Any]:
     @_log_errors
     async def get_host_firmware_version(self) -> None | str:
         firmware_info: Mapping[str, Any] | list = await self._get(
-            "/api/core/firmware/info"
+            "/api/core/firmware/status"
         )
         if not isinstance(firmware_info, Mapping):
             return None
-        firmware: str | None = firmware_info.get("product_version", None)
-        _LOGGER.debug(f"[get_host_firmware_version] firmware: {firmware}")
+        firmware: str | None = firmware_info.get("product", {}).get("product_version")
+        if not firmware or not awesomeversion.AwesomeVersion(firmware).valid:
+            old = firmware
+            firmware: str | None = firmware_info.get("product", {}).get(
+                "product_series", old
+            )
+            if firmware != old:
+                _LOGGER.debug(
+                    f"[get_host_firmware_version] firmware: {old} not valid SemVer, using {firmware}"
+                )
+        else:
+            _LOGGER.debug(f"[get_host_firmware_version] firmware: {firmware}")
         self._firmware_version = firmware
         return firmware