Add time to some events

agenda/__init__.py

@@ -269,6 +269,10 @@ def get_us_holidays(input_date: date) -> list[Event]:
     ]
 
 
+def as_date(d: date | datetime) -> date:
+    return d.date() if isinstance(d, datetime) else d
+
+
 def get_conferences(input_date: date, filepath: str) -> List[Event]:
     """Read conferences from a YAML file and return a list of Event objects."""
     with open(filepath, "r") as f:
@@ -279,7 +283,7 @@ def get_conferences(input_date: date, filepath: str) -> List[Event]:
         event_date = conf["start"]
 
         # Skip the conference if it is before the input date.
-        if event_date < input_date:
+        if as_date(event_date) < input_date:
             continue
         event = Event(
             name="conference",
@@ -337,7 +341,7 @@ def get_accommodation(from_date: date, filepath: str) -> list[Event]:
         )
         from_date = item["from"]
         to_date = item["to"]
-        nights = (to_date - from_date).days
+        nights = (to_date.date() - from_date.date()).days
         night_str = f"{nights} nights" if nights != 1 else "1 night"
         checkin = Event(
             date=from_date,
@@ -359,7 +363,7 @@ def get_travel(from_date: date, method: str, filepath: str) -> list[Event]:
     """Get travel events."""
     return [
         Event(
-            date=item["depart"].date(),
+            date=item["depart"],
             name="transport",
             title=f'{method} from {item["from"]} to {item["to"]}',
             url=item.get("url"),
@@ -441,7 +445,7 @@ def get_data(now: datetime) -> dict[str, str | object]:
     )
     events.append(next_up_series)
 
-    events.sort(key=operator.attrgetter("date"))
+    events.sort(key=operator.attrgetter("as_datetime"))
 
     reply["events"] = events
 

agenda/types.py

@@ -1,7 +1,8 @@
 """Types."""
 
 import dataclasses
-from datetime import date
+import datetime
+from datetime import date, timezone
 
 
 @dataclasses.dataclass
@@ -9,6 +10,44 @@ class Event:
     """Event."""
 
     name: str
-    date: date
+    date: date | datetime.datetime
     title: str | None = None
     url: str | None = None
+
+    @property
+    def as_datetime(self) -> datetime.datetime:
+        """Date/time of event."""
+        d = self.date
+        t0 = datetime.datetime.min.time()
+        return (
+            d
+            if isinstance(d, datetime.datetime)
+            else datetime.datetime.combine(d, t0).replace(tzinfo=timezone.utc)
+        )
+
+    @property
+    def as_date(self) -> datetime.date:
+        """Date of event."""
+        return (
+            self.date.date() if isinstance(self.date, datetime.datetime) else self.date
+        )
+
+    def delta_days(self, today: datetime.date) -> str:
+        """Return number of days from today as a string."""
+        delta = (self.as_date - today).days
+
+        match delta:
+            case 0:
+                return "today"
+            case 1:
+                return "1 day"
+            case _:
+                return f"{delta:,d} days"
+
+    @property
+    def display_date(self) -> str:
+        """Date for display on web page."""
+        if isinstance(self.date, datetime.datetime):
+            return self.date.strftime("%a, %d, %b %Y %H:%M %z")
+        else:
+            return self.date.strftime("%a, %d, %b %Y")