Follow the FVM page format changes

custom_components/water_quality_fvm/manifest.json

@@ -3,7 +3,7 @@
   "name": "Water Quality FVM",
   "documentation": "https://github.com/amaximus/water_quality_fvm",
   "issue_tracker": "https://github.com/amaximus/water_quality_fvm/issues",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "dependencies": [],
   "codeowners": ["@amaximus"],
   "iot_class": "cloud_polling",

custom_components/water_quality_fvm/sensor.py

@@ -3,6 +3,7 @@
 from datetime import timedelta
 import json
 import logging
+import re
 import time
 import voluptuous as vol
 
@@ -87,21 +88,30 @@ async def async_get_wqdata(self):
           jsonstr += ']}'
         else:
           jsonstr += ','
+      if jsonstr is not None:
+        _LOGGER.debug("result: " + str(jsonstr))
     if jsonstr is not None:
       _LOGGER.debug("jsonstr: " + jsonstr)
-      wqjson = json.loads(jsonstr)
+      wqjson = json.loads(jsonstr.replace(',,,,',',').replace('},]}','}]}'))
     return wqjson
 
 def _get_location(region):
   return region.replace('<tr><th colspan="3">','').\
       replace('</th></tr>','')
 
 def _get_wquality(wqstring):
-  return wqstring.replace('<tr><td class="name">','{\"name\":\"').\
-      replace('</td><td class="value">','\",\"value\":\"').\
-      replace('</td><td class="measurment">','\",\"unit\":\"').\
+  HTMLCOMMENT = re.compile('<!--.*-->')
+  wqstring1 = re.sub(HTMLCOMMENT,'',wqstring)
+
+  wqstring2 = wqstring1.replace('<tr><td class="name">','{\"name\":\"').\
+      replace('</td><td class="value text-right">','\",\"value\":\"').\
       replace('</td></tr>','\"}')
 
+  NUMBER = re.compile('([0-9]+,*[0-9]*) ')
+  wqstring = re.sub(NUMBER,'\\1\",\"unit\":\"',wqstring2)
+
+  return wqstring
+
 def _get_wq_limit(argument):
     switcher = {
       "Szabad aktív klór": "1000",

tracker.json

@@ -1,8 +1,8 @@
 {
   "water_quality_fvm": {
-    "version": "0.3.1",
-    "updated_at": "2024-03-26",
+    "version": "0.3.6",
+    "updated_at": "2024-05-10",
     "visit_repo": "https://github.com/amaximus/water_quality_fvm",
-    "changelog": "https://github.com/amaximus/water_quality_fvm/releases/0.3.1"
+    "changelog": "https://github.com/amaximus/water_quality_fvm/releases/0.3.6"
   }
 }