Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
fix(ical): honor elapsed duration across daylight saving changes
Stamina9736e02d74d90
diff --git a/src/Filee.Engines/Data/ICalendar.cs b/src/Filee.Engines/Data/ICalendar.csindex 55b98485..f84998b8 100644--- a/src/Filee.Engines/Data/ICalendar.cs+++ b/src/Filee.Engines/Data/ICalendar.cs@@ -226,6 +226,21 @@ internal static partial class ICalendarcatch (InvalidTimeZoneException) { return null; }}+ // Resolve the offset at an instant after adding the clock part of a DURATION. The local+ // wall time may have crossed a daylight-saving transition since DTSTART.+ private static TimeSpan? OffsetAtInstant(string id, DateTimeOffset instant, Dictionary<string, ZoneDefinition> zones)+ {+ if (zones.TryGetValue(id, out var definition) && !definition.HasRule && definition.Transitions.Count > 0)+ {+ var ordered = definition.Transitions.OrderBy(t => new DateTimeOffset(t.Local, t.From)).ToList();+ var found = ordered.LastOrDefault(t => new DateTimeOffset(t.Local, t.From) <= instant);+ return found == default ? ordered[0].From : found.To;+ }+ try { return TimeZoneInfo.FindSystemTimeZoneById(id).GetUtcOffset(instant); }+ catch (TimeZoneNotFoundException) { return null; }+ catch (InvalidTimeZoneException) { return null; }+ }+private static string DateCell(Property? property, Dictionary<string, ZoneDefinition> zones){if (property is null)@@ -242,7 +257,9 @@ internal static partial class ICalendarreturn offset is null ? text : new DateTimeOffset(value, offset.Value).ToString("yyyy-MM-dd'T'HH:mm:sszzz", CultureInfo.InvariantCulture);}- private static bool Duration(string text, out TimeSpan duration)+ private readonly record struct CalendarDuration(TimeSpan Days, TimeSpan Clock);++ private static bool Duration(string text, out CalendarDuration duration){duration = default;var sign = 1;@@ -257,6 +274,8 @@ internal static partial class ICalendarvar time = false;var digits = "";var any = false;+ var days = TimeSpan.Zero;+ var clock = TimeSpan.Zero;foreach (var ch in text){if (ch == 'T' && !time)@@ -271,7 +290,7 @@ internal static partial class ICalendar}if (digits.Length == 0 || !int.TryParse(digits, out var number))return false;- duration += ch switch+ var part = ch switch{'W' when !time => TimeSpan.FromDays(number * 7d),'D' when !time => TimeSpan.FromDays(number),@@ -280,12 +299,16 @@ internal static partial class ICalendar'S' when time => TimeSpan.FromSeconds(number),_ => TimeSpan.MinValue,};- if (duration < TimeSpan.Zero)+ if (part < TimeSpan.Zero)return false;+ if (ch is 'W' or 'D')+ days += part;+ else+ clock += part;digits = "";any = true;}- duration *= sign;+ duration = new CalendarDuration(days * sign, clock * sign);return any && digits.Length == 0;}@@ -300,10 +323,20 @@ internal static partial class ICalendarif (end is null && start is not null && ParseIcsDate(start, out var startDate, out var date, out var utc)&& component.First("DURATION") is { } span && Duration(span.Value, out var duration)){- var computed = startDate + duration;+ // Calendar days keep the local wall time; hours, minutes and seconds are elapsed time (RFC 5545).+ var dayEnd = startDate + duration.Days;+ var computed = dayEnd + duration.Clock;var synthetic = new Property(start.Name, computed.ToString(date ? "yyyyMMdd" : "yyyyMMdd'T'HHmmss", CultureInfo.InvariantCulture)+ (utc && !date ? "Z" : ""), "", start.Parameters);endCell = DateCell(synthetic, component.Zones);+ var zone = start.Parameter("TZID");+ if (!date && !utc && duration.Clock != TimeSpan.Zero && zone.Length > 0+ && Offset(zone, dayEnd, component.Zones) is { } dayOffset)+ {+ var instant = new DateTimeOffset(dayEnd, dayOffset).Add(duration.Clock);+ if (OffsetAtInstant(zone, instant, component.Zones) is { } endOffset)+ endCell = instant.ToOffset(endOffset).ToString("yyyy-MM-dd'T'HH:mm:sszzz", CultureInfo.InvariantCulture);+ }}rows.Add([diff --git a/tests/Filee.Engines.Tests/ICalendarTests.cs b/tests/Filee.Engines.Tests/ICalendarTests.csindex dc6a6e18..446e54f1 100644--- a/tests/Filee.Engines.Tests/ICalendarTests.cs+++ b/tests/Filee.Engines.Tests/ICalendarTests.cs@@ -78,6 +78,26 @@ public class ICalendarTests(EngineFixture fx) : IClassFixture<EngineFixture>Assert.Equal("2026-11-04", Cell(rows, 3, "End"));}+ [Fact]+ public async Task Duration_crossing_daylight_saving_time_keeps_calendar_days_and_elapsed_hours()+ {+ var customZone = string.Join("\r\n", "BEGIN:VTIMEZONE", "TZID:Custom/Spring", "BEGIN:DAYLIGHT",+ "DTSTART:20260308T020000", "TZOFFSETFROM:-0500", "TZOFFSETTO:-0400", "END:DAYLIGHT", "END:VTIMEZONE");+ var rows = await ReadCalendar(Calendar(customZone,+ Event("spring-clock", "DTSTART;TZID=America/New_York:20260308T013000", "DURATION:PT2H"),+ Event("spring-day", "DTSTART;TZID=America/New_York:20260308T013000", "DURATION:P1D"),+ Event("spring-24h", "DTSTART;TZID=America/New_York:20260308T013000", "DURATION:PT24H"),+ Event("spring-mixed", "DTSTART;TZID=America/New_York:20260307T013000", "DURATION:P1DT2H"),+ Event("fall-clock", "DTSTART;TZID=America/New_York:20261101T003000", "DURATION:PT2H"),+ Event("custom", "DTSTART;TZID=Custom/Spring:20260308T013000", "DURATION:PT2H")));+ Assert.Equal("2026-03-08T04:30:00-04:00", Cell(rows, 1, "End"));+ Assert.Equal("2026-03-09T01:30:00-04:00", Cell(rows, 2, "End"));+ Assert.Equal("2026-03-09T02:30:00-04:00", Cell(rows, 3, "End"));+ Assert.Equal("2026-03-08T04:30:00-04:00", Cell(rows, 4, "End"));+ Assert.Equal("2026-11-01T01:30:00-05:00", Cell(rows, 5, "End"));+ Assert.Equal("2026-03-08T04:30:00-04:00", Cell(rows, 6, "End"));+ }+[Fact]public async Task Outlook_windows_zone_custom_zone_unknown_rules_and_recurrence_instance(){