fix parsing and exposing unit of measure; fixes #26

Author: sim0nx

openhab/client.py

@@ -22,7 +22,6 @@
 import json
 import logging
 import pathlib
-import re
 import time
 import typing
 import warnings
@@ -269,12 +268,6 @@ def json_to_item(self, json_data: dict) -> openhab.items.Item:
       return openhab.items.ContactItem(self, json_data)
 
     if _type.startswith('Number'):
-      if _type.startswith('Number:'):
-        m = re.match(r'''^([^\s]+)''', json_data['state'])
-
-        if m:
-          json_data['state'] = m.group(1)
-
       return openhab.items.NumberItem(self, json_data)
 
     if _type == 'Dimmer':

openhab/items.py

@@ -64,6 +64,7 @@ def __init__(self, openhab_conn: 'openhab.client.OpenHAB', json_data: dict) -> N
     self.group = False
     self.name = ''
     self._state = None  # type: typing.Optional[typing.Any]
+    self._unitOfMeasure = ''
     self._raw_state = None  # type: typing.Optional[typing.Any]  # raw state as returned by the server
     self._members = {}  # type: typing.Dict[str, typing.Any] #  group members (key = item name), for none-group items it's empty
     self.function_name: typing.Optional[str] = None
@@ -140,6 +141,11 @@ def state(self) -> typing.Any:
   def state(self, value: typing.Any) -> None:
     self.update(value)
 
+  @property
+  def unit_of_measure(self) -> str:
+    """Return the unit of measure. Returns an empty string if there is none defined."""
+    return self._unitOfMeasure
+
   @property
   def members(self) -> typing.Dict[str, typing.Any]:
     """If item is a type of Group, it will return all member items for this group.
@@ -583,10 +589,6 @@ def _rest_format(self, value: typing.Union[typing.Tuple[int, int, float], str, i
 
     return value
 
-  @staticmethod
-  def __extract_value_and_unitofmeasure(value: str) -> typing.Tuple[str, str]:
-    return value, ''
-
 
 class RollershutterItem(Item):
   """RollershutterItem item type."""