Unpack alert dt before check.

Unpack 'to_seconds' and check it with a comparison to zero, instead of using 'check_parameter'.
denpamusic · Oct 20, 2023 · 7cabb39 · 7cabb39
1 parent a33e3c7
commit 7cabb39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/pyplumio/structures/alerts.py b/pyplumio/structures/alerts.py
@@ -7,7 +7,6 @@
 
 from pyplumio import util
 from pyplumio.const import AlertType
-from pyplumio.helpers.parameter import check_parameter
 from pyplumio.helpers.typing import EventDataType
 from pyplumio.structures import StructureDecoder, ensure_device_data
 
@@ -66,14 +65,13 @@ def _unpack_alert(self, message: bytearray) -> Alert:
         except ValueError:
             pass
 
-        from_dt_bytes = message[self._offset + 1 : self._offset + 5]
-        to_dt_bytes = message[self._offset + 5 : self._offset + ALERT_SIZE]
-        from_dt = _convert_to_datetime(util.unpack_uint(from_dt_bytes)[0])
-        to_dt = (
-            _convert_to_datetime(util.unpack_uint(to_dt_bytes)[0])
-            if check_parameter(to_dt_bytes)
-            else None
-        )
+        from_seconds = util.unpack_uint(message[self._offset + 1 : self._offset + 5])[0]
+        to_seconds = util.unpack_uint(
+            message[self._offset + 5 : self._offset + ALERT_SIZE]
+        )[0]
+
+        from_dt = _convert_to_datetime(from_seconds)
+        to_dt = _convert_to_datetime(to_seconds) if to_seconds > 0 else None
 
         self._offset += ALERT_SIZE
         return Alert(code, from_dt, to_dt)

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -228,7 +228,7 @@ def fixture_data() -> dict[FrameType, EventDataType]:
                 Alert(
                     code=AlertType.POWER_LOSS,
                     from_dt=datetime(2022, 7, 22, 22, 33),
-                    to_dt=datetime(2022, 7, 22, 22, 38, 11),
+                    to_dt=None,
                 ),
             ]
         },
@@ -402,7 +402,7 @@ def fixture_messages() -> dict[FrameType, bytearray]:
             )
         ),
         FrameType.RESPONSE_ALERTS: bytearray.fromhex(
-            "6400021a5493382B9B94382B009C97372BD398372B"
+            "6400021a5493382B9B94382B009C97372B00000000"
         ),
         FrameType.RESPONSE_SCHEDULES: bytearray.fromhex(
             """100101000005001E0000FFFFFFFE0000FFFFFFFE0000FFFFFFFE0000FFFFFFFE0000FFFFF