Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Message.Encoder should serialize binary data to 0x-led hex strings.

Browse source
This commit is contained in:
Fabio Manganiello 2023-04-02 02:43:06 +02:00
parent 9e5ad0e0b1
commit 31f411868c
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platypush/entities/sensors.py
View file

@ -57,9 +57,14 @@ if 'raw_sensor' not in Base.metadata:
@property @property
def value(self): def value(self):
if self.is_binary: if self._value is None:
return self._value.decode() return None
if self.is_json: if self.is_binary and isinstance(self._value, str):
value = self._value[2:]
return bytes(
[int(value[i : i + 2], 16) for i in range(0, len(value), 2)]
)
if self.is_json and isinstance(self._value, (str, bytes)):
return json.loads(self._value) return json.loads(self._value)
return self._value return self._value

2
platypush/message/__init__.py
View file

@ -44,6 +44,8 @@ class Message:
return obj.tolist() return obj.tolist()
if isinstance(obj, decimal.Decimal): if isinstance(obj, decimal.Decimal):
return float(obj) return float(obj)
if isinstance(obj, (bytes, bytearray)):
return '0x' + ''.join([f'{x:02x}' for x in obj])
if callable(obj): if callable(obj):
return '<function at {}.{}>'.format(obj.__module__, obj.__name__) return '<function at {}.{}>'.format(obj.__module__, obj.__name__)