Make match times local timezone-aware

Author: madduck

pyproject.toml

@@ -13,7 +13,7 @@ write_to = "_version.py"
 
 [project]
 name = "tptools"
-version = "0.6.1"
+version = "0.6.2"
 authors = [{ name = "martin f. krafft", email = "[email protected]" }]
 description = "A set of tools to export data from with TournamentSoftware"
 readme = "README.md"
@@ -39,6 +39,7 @@ dependencies = [
   "fastapi",
   "uvicorn",
   "httpx",
+  "tzlocal",
   "asyncinotify; sys_platform == 'linux'",
   "pywin32; sys_platform == 'win32'",
   "sqlalchemy-access; sys_platform == 'win32'",

tests/test_util.py

@@ -1,7 +1,7 @@
 import asyncio
-from collections.abc import Mapping
 import logging
 import pathlib
+from collections.abc import Mapping
 from contextlib import nullcontext
 from datetime import datetime
 from enum import IntEnum

tptools/match.py

@@ -1,5 +1,6 @@
 import logging
 from datetime import datetime
+from functools import partial
 from typing import Literal, Self, cast
 
 from pydantic import BaseModel
@@ -36,21 +37,13 @@ class Match[EntryT: Entry = Entry, DrawT: Draw = Draw, CourtT: Court = Court](
         "id",
         "matchnr",
         "draw",
-        ("time", TPMatch._time_repr, False),
+        ("time", partial(TPMatch._time_repr, attr="time"), False),
         "court",
         "A",
         "B",
         ("status", TPMatch._status_repr, False),
-        (
-            "starttime",
-            lambda s: s.starttime.isoformat() if s.starttime else None,
-            False,
-        ),
-        (
-            "endtime",
-            lambda s: s.endtime.isoformat() if s.endtime else None,
-            False,
-        ),
+        ("starttime", partial(TPMatch._time_repr, attr="starttime"), False),
+        ("endtime", partial(TPMatch._time_repr, attr="endtime"), False),
         "winner",
         ("scores", lambda s: scores_to_string(s.scores, nullstr="-"), False),
     ]

tptools/tpmatch.py

@@ -6,6 +6,7 @@
 from functools import partial
 from typing import Any, Callable, Literal, Self, cast
 
+import tzlocal
 from pydantic import BaseModel, model_validator
 
 from .mixins import ComparableMixin, ReprMixin, StrMixin
@@ -21,6 +22,8 @@
 
 logger = logging.getLogger(__name__)
 
+LOCAL_TZ = tzlocal = tzlocal.get_localzone()
+
 
 class TPMatchStatus(StrEnum):
     READY = auto()
@@ -163,7 +166,11 @@ def court(self) -> TPCourt | None:
 
     @property
     def time(self) -> datetime | None:
-        return self.pm1.time
+        return (
+            self.pm1.time.replace(tzinfo=LOCAL_TZ)
+            if self.pm1.time is not None
+            else None
+        )
 
     @property
     def played(self) -> bool:
@@ -191,11 +198,19 @@ def scores(self) -> ScoresType:
 
     @property
     def starttime(self) -> datetime | None:
-        return self.pm1.starttime
+        return (
+            self.pm1.starttime.replace(tzinfo=LOCAL_TZ)
+            if self.pm1.starttime is not None
+            else None
+        )
 
     @property
     def endtime(self) -> datetime | None:
-        return self.pm1.endtime
+        return (
+            self.pm1.endtime.replace(tzinfo=LOCAL_TZ)
+            if self.pm1.endtime is not None
+            else None
+        )
 
     @property
     def van(self) -> tuple[int, int]:
@@ -253,8 +268,13 @@ def status(self) -> TPMatchStatus:
 
         return ret
 
-    def _time_repr(self) -> str:
-        return repr(self.time).replace("datetime.", "")
+    def _time_repr(self, attr: str) -> str:
+        dtobj = getattr(self, attr)
+        return (
+            repr(dtobj.replace(tzinfo=None)).replace("datetime.", "")
+            if dtobj is not None
+            else repr(None)
+        )
 
     def _van_repr(self) -> str | None:
         return self.pm1._van_repr()
@@ -286,7 +306,7 @@ def _status_repr(self) -> str:
         "id",
         "draw.name",
         "matchnr",
-        ("time", _time_repr, False),
+        ("time", partial(_time_repr, attr="time"), False),
         ("court", _court_repr, True),
         "slot1?.name",
         "slot2?.name",
@@ -295,8 +315,8 @@ def _status_repr(self) -> str:
         ("wnvn", _wnvn_repr, False),
         ("status", _status_repr, False),
         "winner?.name",
-        "starttime",
-        "endtime",
+        ("starttime", partial(_time_repr, attr="starttime"), False),
+        ("endtime", partial(_time_repr, attr="endtime"), False),
         ("scores", lambda s: scores_to_string(s.scores, nullstr="-"), False),
     )