fixes

Author: bdraco

onvif/types.py

@@ -84,7 +84,6 @@ def pythonvalue(self, value: str) -> time:
         # For example, 2024-08-17T00:61:16Z so we need
         # to fix the overflow
         fixed_time, offset = _try_fix_time_overflow(value)
-        try:
-            return isodate.parse_time(fixed_time) + timedelta(**offset)
-        except ValueError:
-            return isodate.parse_time(value)
+        if fixed_dt := _try_parse_datetime(f"2024-01-15T{fixed_time}Z"):
+            return (fixed_dt + timedelta(**offset)).time()
+        return isodate.parse_time(value)

tests/test_types.py

@@ -8,6 +8,7 @@
 from onvif.client import ONVIFCamera
 from onvif.settings import DEFAULT_SETTINGS
 from onvif.transport import ASYNC_TRANSPORT
+from onvif.types import FastDateTime, ForgivingTime
 
 INVALID_TERM_TIME = b'<?xml version="1.0" encoding="UTF-8"?>\r\n<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://www.w3.org/2003/05/soap-envelope" xmlns:SOAP-ENC="http://www.w3.org/2003/05/soap-encoding" xmlns:tev="http://www.onvif.org/ver10/events/wsdl" xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" xmlns:wsa5="http://www.w3.org/2005/08/addressing" xmlns:chan="http://schemas.microsoft.com/ws/2005/02/duplex" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tns1="http://www.onvif.org/ver10/topics">\r\n<SOAP-ENV:Header>\r\n<wsa5:Action>http://www.onvif.org/ver10/events/wsdl/PullPointSubscription/PullMessagesResponse</wsa5:Action>\r\n</SOAP-ENV:Header>\r\n<SOAP-ENV:Body>\r\n<tev:PullMessagesResponse>\r\n<tev:CurrentTime>2024-08-17T00:56:16Z</tev:CurrentTime>\r\n<tev:TerminationTime>2024-08-17T00:61:16Z</tev:TerminationTime>\r\n</tev:PullMessagesResponse>\r\n</SOAP-ENV:Body>\r\n</SOAP-ENV:Envelope>\r\n'
 _WSDL_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), "onvif", "wsdl")
@@ -37,3 +38,30 @@ async def test_parse_invalid_time(caplog: pytest.LogCaptureFixture) -> None:
         2024, 8, 17, 1, 1, 16, tzinfo=datetime.timezone.utc
     )
     assert "ValueError" not in caplog.text
+
+
+def test_fix_datetime_overflow() -> None:
+    assert FastDateTime().pythonvalue("2024-08-17T00:61:16Z") == datetime.datetime(
+        2024, 8, 17, 1, 1, 16, tzinfo=datetime.timezone.utc
+    )
+    assert FastDateTime().pythonvalue("2024-08-17T00:60:16Z") == datetime.datetime(
+        2024, 8, 17, 1, 0, 16, tzinfo=datetime.timezone.utc
+    )
+    assert FastDateTime().pythonvalue("2024-08-17T00:59:16Z") == datetime.datetime(
+        2024, 8, 17, 0, 59, 16, tzinfo=datetime.timezone.utc
+    )
+    assert FastDateTime().pythonvalue("2024-08-17T23:59:59Z") == datetime.datetime(
+        2024, 8, 17, 23, 59, 59, tzinfo=datetime.timezone.utc
+    )
+    assert FastDateTime().pythonvalue("2024-08-17T24:00:00Z") == datetime.datetime(
+        2024, 8, 18, 0, 0, 0, tzinfo=datetime.timezone.utc
+    )
+
+
+def test_fix_time_overflow() -> None:
+    assert ForgivingTime().pythonvalue("24:00:00") == datetime.time(0, 0, 0)
+    assert ForgivingTime().pythonvalue("23:59:59") == datetime.time(23, 59, 59)
+    assert ForgivingTime().pythonvalue("23:59:60") == datetime.time(0, 0, 0)
+    assert ForgivingTime().pythonvalue("23:59:61") == datetime.time(0, 0, 1)
+    assert ForgivingTime().pythonvalue("23:60:00") == datetime.time(0, 0, 0)
+    assert ForgivingTime().pythonvalue("23:61:00") == datetime.time(0, 1, 0)