Skip to content

Commit 4aa126e

Browse files
committed
Remove message length in parser
1 parent b45b6ef commit 4aa126e

File tree

1 file changed

+16
-26
lines changed

1 file changed

+16
-26
lines changed

plugwise/parser.py

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -87,35 +87,25 @@ def parse_data(self):
8787
self._buffer[4:8], footer_index, self._buffer[8:12]
8888
)
8989
if self._message:
90-
if len(self._buffer[: footer_index + 2]) == len(self._message):
91-
try:
92-
self._message.deserialize(
93-
self._buffer[: footer_index + 2]
94-
)
95-
except (
96-
InvalidMessageChecksum,
97-
InvalidMessageFooter,
98-
InvalidMessageHeader,
99-
InvalidMessageLength,
100-
) as e:
101-
_LOGGER.warning(e)
102-
except Exception as e:
103-
_LOGGER.error(
104-
"Failed to parse %s message (%s)",
105-
self._message.__class__.__name__,
106-
str(self._buffer[: footer_index + 2]),
107-
)
108-
_LOGGER.error(e)
109-
else:
110-
# Submit message
111-
self.next_message(self._message)
112-
else:
90+
try:
91+
self._message.deserialize(self._buffer[: footer_index + 2])
92+
except (
93+
InvalidMessageChecksum,
94+
InvalidMessageFooter,
95+
InvalidMessageHeader,
96+
InvalidMessageLength,
97+
) as e:
98+
_LOGGER.warning(e)
99+
except Exception as e:
113100
_LOGGER.error(
114-
"Skip message, received %s bytes of expected %s bytes for message %s",
115-
len(self._buffer[: footer_index + 2]),
116-
len(self._message),
101+
"Failed to parse %s message (%s)",
117102
self._message.__class__.__name__,
103+
str(self._buffer[: footer_index + 2]),
118104
)
105+
_LOGGER.error(e)
106+
else:
107+
# Submit message
108+
self.next_message(self._message)
119109
# Parse remaining buffer
120110
self.reset_parser(self._buffer[footer_index + 2 :])
121111
else:

0 commit comments

Comments
 (0)