coverage

Author: bdraco

onvif/types.py

@@ -53,7 +53,7 @@ def pythonvalue(self, value: str) -> datetime:
         # lazy hack ;-)
         if len(value) == 10:
             value += "T00:00:00"
-        elif (len(value) == 19 or len(value) == 26) and value[10] == " ":
+        elif (len(value) in (19, 20, 26)) and value[10] == " ":
             value = "T".join(value.split(" "))
 
         if dt := _try_parse_datetime(value):
@@ -63,7 +63,11 @@ def pythonvalue(self, value: str) -> datetime:
         # For example, 2024-08-17T00:61:16Z so we need
         # to fix the overflow
         date, _, time = value.partition("T")
-        fixed_time, offset = _try_fix_time_overflow(time)
+        try:
+            fixed_time, offset = _try_fix_time_overflow(time)
+        except ValueError:
+            return ciso8601.parse_datetime(value)
+
         if dt := _try_parse_datetime(f"{date}T{fixed_time}"):
             return dt + timedelta(**offset)
 
@@ -83,7 +87,10 @@ def pythonvalue(self, value: str) -> time:
         # Some cameras overflow the hours/minutes/seconds
         # For example, 00:61:16Z so we need
         # to fix the overflow
-        fixed_time, offset = _try_fix_time_overflow(value)
+        try:
+            fixed_time, offset = _try_fix_time_overflow(value)
+        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

@@ -15,7 +15,7 @@
 
 
 @pytest.mark.asyncio
-async def test_parse_invalid_time(caplog: pytest.LogCaptureFixture) -> None:
+async def test_parse_invalid_dt(caplog: pytest.LogCaptureFixture) -> None:
     device = ONVIFCamera("127.0.0.1", 80, "user", "pass", wsdl_dir=_WSDL_PATH)
     device.xaddrs = {
         "http://www.onvif.org/ver10/events/wsdl": "http://192.168.210.102:6688/onvif/event_service"
@@ -40,6 +40,31 @@ async def test_parse_invalid_time(caplog: pytest.LogCaptureFixture) -> None:
     assert "ValueError" not in caplog.text
 
 
+def test_parse_invalid_datetime() -> None:
+    with pytest.raises(ValueError, match="Invalid character while parsing year"):
+        FastDateTime().pythonvalue("aaaa-aa-aaTaa:aa:aaZ")
+
+
+def test_parse_invalid_time() -> None:
+    with pytest.raises(ValueError, match="Unrecognised ISO 8601 time format"):
+        ForgivingTime().pythonvalue("aa:aa:aa")
+
+
+def test_fix_datetime_missing_time() -> None:
+    assert FastDateTime().pythonvalue("2024-08-17") == datetime.datetime(
+        2024, 8, 17, 0, 0, 0
+    )
+
+
+def test_fix_datetime_missing_t() -> None:
+    assert FastDateTime().pythonvalue("2024-08-17 00:61:16Z") == datetime.datetime(
+        2024, 8, 17, 1, 1, 16, tzinfo=datetime.timezone.utc
+    )
+    assert FastDateTime().pythonvalue("2024-08-17 00:61:16") == datetime.datetime(
+        2024, 8, 17, 1, 1, 16
+    )
+
+
 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