Handle whole-day recurring events properly

Fixes #365, #308

Author: jelmer

xandikos/icalendar.py

@@ -21,13 +21,13 @@
 
 import logging
 from collections.abc import Iterable
-from datetime import datetime, time, timedelta, timezone
+from datetime import date, datetime, time, timedelta, timezone
 from typing import Callable, Optional, Union
 from zoneinfo import ZoneInfo
 
 import dateutil.rrule
 from icalendar.cal import Calendar, Component, component_factory
-from icalendar.prop import TypesFactory, vCategory, vDatetime, vDDDTypes, vText
+from icalendar.prop import TypesFactory, vCategory, vDate, vDatetime, vDDDTypes, vText
 
 from xandikos.store import File, Filter, InvalidFileContents
 
@@ -974,19 +974,34 @@ def _expand_rrule_component(
     if "RRULE" not in incomp:
         return
     rs = rruleset_from_comp(incomp)
+
+    # Check if original DTSTART is date-only
+    original_dtstart = incomp["DTSTART"]
+    is_date_only = isinstance(original_dtstart.dt, date) and not isinstance(
+        original_dtstart.dt, datetime
+    )
+
     for field in ["RRULE", "EXRULE", "UNTIL", "RDATE", "EXDATE"]:
         if field in incomp:
             del incomp[field]
     # Work our magic
-    for ts in rs.between(start, end):
-        utcts = asutc(ts)
+    for ts in rs.between(start, end, inc=True):
+        # For date-only events, convert rrule's datetime back to date
+        if is_date_only:
+            ts_normalized = ts.date()
+        else:
+            ts_normalized = asutc(ts)
+
         try:
-            outcomp = existing.pop(utcts)
-            outcomp["DTSTART"] = vDatetime(asutc(outcomp["DTSTART"].dt))
+            outcomp = existing.pop(ts_normalized)
+            # Preserve the original DTSTART value and type from the exception
+            # It's already the correct type
         except KeyError:
             outcomp = incomp.copy()
-            outcomp["DTSTART"] = vDatetime(utcts)
-        outcomp["RECURRENCE-ID"] = vDatetime(utcts)
+            outcomp["DTSTART"] = create_prop_from_date_or_datetime(ts_normalized)
+
+        # Set RECURRENCE-ID with appropriate type
+        outcomp["RECURRENCE-ID"] = create_prop_from_date_or_datetime(ts_normalized)
         yield outcomp
 
 
@@ -1016,4 +1031,15 @@ def expand_calendar_rrule(incal: Calendar, start: datetime, end: datetime) -> Ca
 
 
 def asutc(dt):
+    if isinstance(dt, date) and not isinstance(dt, datetime):
+        # Return date as-is - dates are timezone-agnostic
+        return dt
     return dt.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
+
+
+def create_prop_from_date_or_datetime(dt):
+    """Create appropriate vDate or vDatetime property based on input type."""
+    if isinstance(dt, date) and not isinstance(dt, datetime):
+        return vDate(dt)
+    else:
+        return vDatetime(dt)

xandikos/tests/test_icalendar.py

@@ -36,6 +36,7 @@
     TextMatcher,
     apply_time_range_vevent,
     as_tz_aware_ts,
+    expand_calendar_rrule,
     validate_calendar,
 )
 
@@ -509,3 +510,54 @@ def test_missing_dtstart(self):
             ev,
             self._tzify,
         )
+
+
+class ExpandCalendarRRuleTests(unittest.TestCase):
+    def test_expand_recurring_date_only_with_exception(self):
+        """Test expansion of recurring events with date-only values and exceptions.
+
+        This test reproduces issue #365 where expanding recurring all-day events
+        with exceptions would fail due to date vs datetime type mismatch.
+        """
+        from icalendar import Calendar
+
+        # Create a calendar with a bi-weekly recurring event and an exception
+        test_ical = b"""BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Test//Test//EN
+BEGIN:VEVENT
+UID:[email protected]
+DTSTART;VALUE=DATE:20240101
+SUMMARY:Bi-weekly event
+RRULE:FREQ=WEEKLY;INTERVAL=2
+END:VEVENT
+BEGIN:VEVENT
+UID:[email protected]
+RECURRENCE-ID;VALUE=DATE:20240115
+DTSTART;VALUE=DATE:20240116
+SUMMARY:Bi-weekly event (moved)
+END:VEVENT
+END:VCALENDAR"""
+
+        cal = Calendar.from_ical(test_ical)
+
+        # Expand the calendar
+        start = datetime(2024, 1, 1)
+        end = datetime(2024, 2, 1)
+
+        expanded = expand_calendar_rrule(cal, start, end)
+
+        # Verify we got the expected events
+        events = [comp for comp in expanded.walk() if comp.name == "VEVENT"]
+        self.assertEqual(len(events), 3)  # Jan 1, Jan 15 (moved to 16), Jan 29
+
+        # Check that the exception was properly handled
+        dates = sorted([ev["DTSTART"].dt for ev in events])
+        from datetime import date
+
+        expected_dates = [
+            date(2024, 1, 1),
+            date(2024, 1, 16),  # Moved from Jan 15
+            date(2024, 1, 29),
+        ]
+        self.assertEqual(dates, expected_dates)