data/TaskRecurrence.cpp
| Line | Branch | Exec | Source |
|---|---|---|---|
| 1 | #include "TaskRecurrence.h" | ||
| 2 | #include "ICalTodoCodec.h" | ||
| 3 | #include "RecurrenceExpansion.h" | ||
| 4 | #include "RecurrenceRule.h" | ||
| 5 | |||
| 6 | #include <QTimeZone> | ||
| 7 | #include <algorithm> | ||
| 8 | |||
| 9 | namespace TaskRecurrence { | ||
| 10 | 122 | bool supported(const CalendarTask &task) { | |
| 11 |
6/10✓ Branch 3 → 4 taken 122 times.
✗ Branch 3 → 7 not taken.
✓ Branch 4 → 5 taken 122 times.
✓ Branch 5 → 6 taken 122 times.
✓ Branch 6 → 7 taken 121 times.
✓ Branch 6 → 8 taken 1 time.
✓ Branch 10 → 11 taken 122 times.
✗ Branch 10 → 12 not taken.
✗ Branch 14 → 15 not taken.
✗ Branch 14 → 16 not taken.
|
122 | return task.rrule.isEmpty() || RecurrenceRule::parse(task.rrule).fullySupported(); |
| 12 | } | ||
| 13 | |||
| 14 | namespace { | ||
| 15 | using Frequency = RecurrenceRule::Frequency; | ||
| 16 | |||
| 17 | 105 | bool timeFromBase(const RecurrenceRule &rule) { | |
| 18 |
2/2✓ Branch 3 → 4 taken 44 times.
✓ Branch 3 → 6 taken 30 times.
|
74 | return rule.frequency == Frequency::Daily || rule.frequency == Frequency::Weekly || |
| 19 |
6/6✓ Branch 2 → 3 taken 74 times.
✓ Branch 2 → 6 taken 31 times.
✓ Branch 4 → 5 taken 12 times.
✓ Branch 4 → 6 taken 32 times.
✓ Branch 5 → 6 taken 8 times.
✓ Branch 5 → 7 taken 4 times.
|
179 | rule.frequency == Frequency::Monthly || rule.frequency == Frequency::Yearly; |
| 20 | } | ||
| 21 | |||
| 22 | // The parts a rule takes implicitly from its base (weekday, month day, month, | ||
| 23 | // time of day) written out explicitly, so the base can move without changing | ||
| 24 | // the pattern (TASK-RECUR-RDATE). | ||
| 25 | 7 | RecurrenceRule pinnedToBase(RecurrenceRule rule, const QDateTime &base, const QTime &wallTime, bool allDay) { | |
| 26 |
1/1✓ Branch 2 → 3 taken 7 times.
|
7 | const QDate day = base.date(); |
| 27 |
7/8✓ Branch 3 → 4 taken 4 times.
✓ Branch 3 → 7 taken 3 times.
✓ Branch 5 → 6 taken 4 times.
✗ Branch 5 → 7 not taken.
✓ Branch 8 → 9 taken 4 times.
✓ Branch 8 → 12 taken 3 times.
✓ Branch 9 → 10 taken 4 times.
✓ Branch 10 → 11 taken 4 times.
|
7 | if (rule.frequency == Frequency::Weekly && rule.byDay.isEmpty()) rule.byDay = {{0, day.dayOfWeek()}}; |
| 28 |
6/8✓ Branch 12 → 13 taken 1 time.
✓ Branch 12 → 18 taken 6 times.
✓ Branch 14 → 15 taken 1 time.
✗ Branch 14 → 18 not taken.
✓ Branch 16 → 17 taken 1 time.
✗ Branch 16 → 18 not taken.
✓ Branch 19 → 20 taken 1 time.
✓ Branch 19 → 23 taken 6 times.
|
7 | if (rule.frequency == Frequency::Monthly && rule.byDay.isEmpty() && rule.byMonthDay.isEmpty()) |
| 29 |
2/2✓ Branch 20 → 21 taken 1 time.
✓ Branch 21 → 22 taken 1 time.
|
1 | rule.byMonthDay = {day.day()}; |
| 30 |
2/10✗ Branch 23 → 24 not taken.
✓ Branch 23 → 31 taken 7 times.
✗ Branch 25 → 26 not taken.
✗ Branch 25 → 31 not taken.
✗ Branch 27 → 28 not taken.
✗ Branch 27 → 31 not taken.
✗ Branch 29 → 30 not taken.
✗ Branch 29 → 31 not taken.
✗ Branch 32 → 33 not taken.
✓ Branch 32 → 45 taken 7 times.
|
7 | if (rule.frequency == Frequency::Yearly && rule.byMonth.isEmpty() && rule.byWeekNo.isEmpty() && rule.byYearDay.isEmpty()) { |
| 31 | ✗ | rule.byMonth = {day.month()}; | |
| 32 | ✗ | if (rule.byDay.isEmpty() && rule.byMonthDay.isEmpty()) rule.byMonthDay = {day.day()}; | |
| 33 | } | ||
| 34 |
3/6✓ Branch 45 → 46 taken 7 times.
✗ Branch 45 → 49 not taken.
✓ Branch 47 → 48 taken 7 times.
✗ Branch 47 → 49 not taken.
✓ Branch 50 → 51 taken 7 times.
✗ Branch 50 → 66 not taken.
|
7 | if (!allDay && timeFromBase(rule)) { |
| 35 |
3/4✓ Branch 52 → 53 taken 7 times.
✗ Branch 52 → 56 not taken.
✓ Branch 53 → 54 taken 7 times.
✓ Branch 54 → 55 taken 7 times.
|
7 | if (rule.byHour.isEmpty()) rule.byHour = {wallTime.hour()}; |
| 36 |
3/4✓ Branch 57 → 58 taken 7 times.
✗ Branch 57 → 61 not taken.
✓ Branch 58 → 59 taken 7 times.
✓ Branch 59 → 60 taken 7 times.
|
7 | if (rule.byMinute.isEmpty()) rule.byMinute = {wallTime.minute()}; |
| 37 |
3/4✓ Branch 62 → 63 taken 7 times.
✗ Branch 62 → 66 not taken.
✓ Branch 63 → 64 taken 7 times.
✓ Branch 64 → 65 taken 7 times.
|
7 | if (rule.bySecond.isEmpty()) rule.bySecond = {wallTime.second()}; |
| 38 | } | ||
| 39 | 14 | return rule; | |
| 40 | } | ||
| 41 | |||
| 42 | // The first occurrence after `anchor` up to `end`. Searched in growing | ||
| 43 | // windows: a rule without an end looks ten years ahead, and expanding all of | ||
| 44 | // them for a daily task took ~0.7 s per completion with floating times | ||
| 45 | // (Sprint 102 fuzzing). The first window that holds a later start holds the | ||
| 46 | // earliest one, because every occurrence starting by its last day is in it. | ||
| 47 | // S106-132: `*unknown` is set when an expansion was cut off (work cap) — | ||
| 48 | // then "no later occurrence" is not known and must not complete the series. | ||
| 49 | 121 | QDateTime nextAfter(const CalendarEvent &event, const QDateTime &anchor, const QDate &end, bool *unknown) { | |
| 50 |
5/6✓ Branch 2 → 3 taken 121 times.
✓ Branch 3 → 4 taken 121 times.
✓ Branch 4 → 5 taken 121 times.
✓ Branch 5 → 6 taken 121 times.
✓ Branch 58 → 8 taken 146 times.
✗ Branch 58 → 59 not taken.
|
146 | for (const QDate &limit : {anchor.date().addDays(40), anchor.date().addYears(2), end}) { |
| 51 | 146 | const QDate to = qMin(limit, end); | |
| 52 |
0/2✗ Branch 84 → 85 not taken.
✗ Branch 84 → 86 not taken.
|
146 | QDateTime next; |
| 53 |
8/10✓ Branch 11 → 12 taken 146 times.
✓ Branch 14 → 15 taken 146 times.
✓ Branch 17 → 18 taken 146 times.
✓ Branch 17 → 19 taken 146 times.
✓ Branch 20 → 21 taken 146 times.
✓ Branch 21 → 22 taken 146 times.
✓ Branch 40 → 23 taken 2526 times.
✓ Branch 40 → 41 taken 146 times.
✗ Branch 67 → 68 not taken.
✗ Branch 67 → 69 not taken.
|
2964 | for (const auto &occurrence : expandEventsForDisplay({event}, anchor.date(), to, false)) { |
| 54 |
2/2✓ Branch 24 → 25 taken 1 time.
✓ Branch 24 → 26 taken 2525 times.
|
2526 | if (occurrence.partialRecurrence) *unknown = true; |
| 55 |
10/11✓ Branch 26 → 27 taken 2526 times.
✓ Branch 28 → 29 taken 2380 times.
✓ Branch 28 → 35 taken 146 times.
✓ Branch 29 → 30 taken 2380 times.
✓ Branch 30 → 31 taken 2265 times.
✓ Branch 30 → 34 taken 115 times.
✓ Branch 31 → 32 taken 2265 times.
✗ Branch 33 → 34 not taken.
✓ Branch 33 → 35 taken 2265 times.
✓ Branch 36 → 37 taken 115 times.
✓ Branch 36 → 38 taken 2411 times.
|
2526 | if (occurrence.dtStart > anchor && (!next.isValid() || occurrence.dtStart < next)) next = occurrence.dtStart; |
| 56 | 146 | } | |
| 57 |
9/9✓ Branch 42 → 43 taken 146 times.
✓ Branch 43 → 44 taken 31 times.
✓ Branch 43 → 48 taken 115 times.
✓ Branch 46 → 47 taken 26 times.
✓ Branch 46 → 48 taken 5 times.
✓ Branch 47 → 48 taken 1 time.
✓ Branch 47 → 49 taken 25 times.
✓ Branch 50 → 51 taken 121 times.
✓ Branch 50 → 52 taken 25 times.
|
146 | if (next.isValid() || to >= end || *unknown) |
| 58 | 121 | return next; | |
| 59 | 25 | } | |
| 60 | ✗ | return {}; | |
| 61 | 292 | } | |
| 62 | |||
| 63 | // The last start a COUNT rule counts, if COUNT is reached by `end` (two | ||
| 64 | // days of display margin, as the expansion uses); invalid otherwise or when | ||
| 65 | // the rule cannot be expanded completely. The naive engine counts on the | ||
| 66 | // wall clock without zone conversions and only the last start is converted: | ||
| 67 | // expanding every occurrence of a long daily series for display cost about | ||
| 68 | // 0.4 s per completion with a floating time (Sprint 104 fuzz finding vtodo). | ||
| 69 | 6 | QDateTime lastCountedStart(const CalendarEvent &series, const RecurrenceRule &rule, const QDate &end) { | |
| 70 |
7/9✓ Branch 2 → 3 taken 1 time.
✓ Branch 2 → 5 taken 5 times.
✓ Branch 3 → 4 taken 1 time.
✓ Branch 4 → 6 taken 1 time.
✓ Branch 5 → 6 taken 5 times.
✓ Branch 6 → 7 taken 1 time.
✓ Branch 6 → 8 taken 5 times.
✗ Branch 70 → 71 not taken.
✗ Branch 70 → 72 not taken.
|
6 | const QDate firstDay = series.allDay ? series.dtStart.toUTC().date() : series.dtStart.date(); |
| 71 |
6/6✓ Branch 8 → 9 taken 6 times.
✓ Branch 9 → 10 taken 1 time.
✓ Branch 9 → 11 taken 5 times.
✓ Branch 10 → 12 taken 1 time.
✓ Branch 11 → 12 taken 5 times.
✓ Branch 12 → 13 taken 6 times.
|
6 | const QDateTime naiveStart(firstDay, series.allDay ? QTime(0, 0) : series.dtStart.time(), QTimeZone::utc()); |
| 72 |
4/4✓ Branch 14 → 15 taken 6 times.
✓ Branch 15 → 16 taken 6 times.
✓ Branch 16 → 17 taken 6 times.
✓ Branch 17 → 18 taken 6 times.
|
6 | const QDateTime naiveEnd(end.addDays(2), QTime(23, 59, 59), QTimeZone::utc()); |
| 73 |
1/1✓ Branch 21 → 22 taken 6 times.
|
6 | const NaiveExpansion naive = expandNaive(rule, naiveStart, naiveStart, naiveEnd); |
| 74 |
6/8✓ Branch 24 → 25 taken 6 times.
✗ Branch 24 → 28 not taken.
✓ Branch 25 → 26 taken 5 times.
✓ Branch 25 → 28 taken 1 time.
✗ Branch 27 → 28 not taken.
✓ Branch 27 → 29 taken 5 times.
✓ Branch 30 → 31 taken 1 time.
✓ Branch 30 → 32 taken 5 times.
|
6 | if (naive.partial || naive.truncated || naive.starts.size() < rule.count) return {}; |
| 75 |
1/1✓ Branch 33 → 34 taken 5 times.
|
5 | const QDate lastDay = naive.starts.last().date(); |
| 76 | 5 | QDateTime last; | |
| 77 |
9/11✓ Branch 36 → 37 taken 5 times.
✓ Branch 37 → 38 taken 5 times.
✓ Branch 40 → 41 taken 5 times.
✓ Branch 43 → 44 taken 5 times.
✓ Branch 43 → 45 taken 5 times.
✓ Branch 46 → 47 taken 5 times.
✓ Branch 47 → 48 taken 5 times.
✓ Branch 61 → 49 taken 7 times.
✓ Branch 61 → 62 taken 5 times.
✗ Branch 90 → 91 not taken.
✗ Branch 90 → 92 not taken.
|
22 | for (const auto &occurrence : expandEventsForDisplay({series}, lastDay.addDays(-2), lastDay.addDays(2), false)) |
| 78 |
6/8✓ Branch 50 → 51 taken 7 times.
✓ Branch 51 → 52 taken 2 times.
✓ Branch 51 → 55 taken 5 times.
✓ Branch 52 → 53 taken 2 times.
✓ Branch 54 → 55 taken 2 times.
✗ Branch 54 → 56 not taken.
✓ Branch 57 → 58 taken 7 times.
✗ Branch 57 → 59 not taken.
|
12 | if (!last.isValid() || occurrence.dtStart > last) last = occurrence.dtStart; |
| 79 | 5 | return last; | |
| 80 | 16 | } | |
| 81 | |||
| 82 | ✗ | QList<QDateTime> startsAfter(const CalendarEvent &series, const QDateTime &after, const QDate &end) { | |
| 83 | ✗ | QList<QDateTime> starts; | |
| 84 | ✗ | for (const auto &occurrence : expandEventsForDisplay({series}, series.dtStart.date(), end, false)) | |
| 85 | ✗ | if (occurrence.dtStart > after) starts << occurrence.dtStart; | |
| 86 | ✗ | std::sort(starts.begin(), starts.end()); | |
| 87 | ✗ | return starts; | |
| 88 | ✗ | } | |
| 89 | |||
| 90 | // Do two series start at exactly the same times after `after` (up to | ||
| 91 | // `end`)? Comparing both ten-year expansions for display cost ~0.3 s per | ||
| 92 | // completion of a daily task with a floating time (Sprint 105 fuzz finding | ||
| 93 | // vtodo). Two series of the same zone and kind without UNTIL are compared | ||
| 94 | // on the wall clock with the naive engine (the zone maps equal wall times | ||
| 95 | // to equal instants); otherwise the display expansion runs in growing | ||
| 96 | // windows and the first window with a difference answers. | ||
| 97 | 7 | bool sameStartsAfter(const CalendarEvent &moved, const CalendarEvent &original, const QDateTime &after, const QDate &end) { | |
| 98 |
1/1✓ Branch 2 → 3 taken 7 times.
|
7 | const RecurrenceRule movedRule = RecurrenceRule::parse(moved.rrule); |
| 99 |
1/1✓ Branch 3 → 4 taken 7 times.
|
7 | const RecurrenceRule originalRule = RecurrenceRule::parse(original.rrule); |
| 100 |
4/6✓ Branch 5 → 6 taken 7 times.
✓ Branch 6 → 7 taken 7 times.
✓ Branch 7 → 8 taken 7 times.
✗ Branch 7 → 17 not taken.
✓ Branch 11 → 12 taken 7 times.
✗ Branch 11 → 17 not taken.
|
14 | const bool sameClock = moved.allDay == original.allDay && moved.dtStart.timeSpec() == original.dtStart.timeSpec() && |
| 101 |
10/24✓ Branch 4 → 5 taken 7 times.
✗ Branch 4 → 17 not taken.
✓ Branch 8 → 9 taken 7 times.
✓ Branch 9 → 10 taken 7 times.
✓ Branch 12 → 13 taken 7 times.
✓ Branch 13 → 14 taken 7 times.
✓ Branch 15 → 16 taken 7 times.
✗ Branch 15 → 17 not taken.
✓ Branch 18 → 19 taken 7 times.
✗ Branch 18 → 20 not taken.
✓ Branch 20 → 21 taken 7 times.
✗ Branch 20 → 22 not taken.
✓ Branch 22 → 23 taken 7 times.
✗ Branch 22 → 24 not taken.
✓ Branch 24 → 25 taken 7 times.
✗ Branch 24 → 26 not taken.
✗ Branch 114 → 115 not taken.
✗ Branch 114 → 116 not taken.
✗ Branch 118 → 119 not taken.
✗ Branch 118 → 120 not taken.
✗ Branch 122 → 123 not taken.
✗ Branch 122 → 124 not taken.
✗ Branch 126 → 127 not taken.
✗ Branch 126 → 128 not taken.
|
21 | moved.dtStart.timeZone() == original.dtStart.timeZone() && after.timeZone() == moved.dtStart.timeZone(); |
| 102 |
5/10✓ Branch 26 → 27 taken 7 times.
✗ Branch 26 → 33 not taken.
✓ Branch 28 → 29 taken 7 times.
✗ Branch 28 → 33 not taken.
✓ Branch 30 → 31 taken 7 times.
✗ Branch 30 → 33 not taken.
✓ Branch 31 → 32 taken 7 times.
✗ Branch 31 → 33 not taken.
✓ Branch 34 → 35 taken 7 times.
✗ Branch 34 → 88 not taken.
|
7 | if (sameClock && movedRule.until.isEmpty() && originalRule.until.isEmpty() && !moved.allDay) { |
| 103 |
4/4✓ Branch 2 → 3 taken 21 times.
✓ Branch 3 → 4 taken 21 times.
✓ Branch 4 → 5 taken 21 times.
✓ Branch 5 → 6 taken 21 times.
|
21 | const auto wall = [](const QDateTime &time) { return QDateTime(time.date(), time.time(), QTimeZone::utc()); }; |
| 104 |
1/1✓ Branch 35 → 36 taken 7 times.
|
7 | const QDateTime from = wall(after); |
| 105 |
4/4✓ Branch 36 → 37 taken 7 times.
✓ Branch 37 → 38 taken 7 times.
✓ Branch 38 → 39 taken 7 times.
✓ Branch 39 → 40 taken 7 times.
|
7 | const QDateTime to(end.addDays(2), QTime(23, 59, 59), QTimeZone::utc()); |
| 106 |
2/2✓ Branch 43 → 44 taken 7 times.
✓ Branch 44 → 45 taken 7 times.
|
7 | const NaiveExpansion a = expandNaive(movedRule, wall(moved.dtStart), from, to); |
| 107 |
2/2✓ Branch 50 → 51 taken 7 times.
✓ Branch 51 → 52 taken 7 times.
|
7 | const NaiveExpansion b = expandNaive(originalRule, wall(original.dtStart), from, to); |
| 108 |
4/8✓ Branch 55 → 56 taken 7 times.
✗ Branch 55 → 70 not taken.
✓ Branch 56 → 57 taken 7 times.
✗ Branch 56 → 70 not taken.
✓ Branch 57 → 58 taken 7 times.
✗ Branch 57 → 70 not taken.
✓ Branch 58 → 59 taken 7 times.
✗ Branch 58 → 70 not taken.
|
7 | if (!a.partial && !a.truncated && !b.partial && !b.truncated) { |
| 109 | 14 | const auto later = [&from](QList<QDateTime> starts) { | |
| 110 | 18535 | starts.removeIf([&from](const QDateTime &start) { return start <= from; }); | |
| 111 | 14 | return starts; | |
| 112 | 7 | }; | |
| 113 |
3/3✓ Branch 60 → 61 taken 7 times.
✓ Branch 62 → 63 taken 7 times.
✓ Branch 63 → 64 taken 7 times.
|
7 | return later(a.starts) == later(b.starts); |
| 114 | } | ||
| 115 | 28 | } | |
| 116 | ✗ | for (const QDate &limit : {after.date().addDays(40), after.date().addYears(2), end}) { | |
| 117 | ✗ | const QDate to = qMin(limit, end); | |
| 118 | ✗ | if (startsAfter(moved, after, to) != startsAfter(original, after, to)) return false; | |
| 119 | ✗ | if (to >= end) return true; | |
| 120 | } | ||
| 121 | ✗ | return true; | |
| 122 | 7 | } | |
| 123 | } // namespace | ||
| 124 | |||
| 125 | 122 | bool complete(CalendarTask *task, const QDateTime &now) { | |
| 126 |
7/9✓ Branch 2 → 3 taken 122 times.
✗ Branch 2 → 7 not taken.
✓ Branch 4 → 5 taken 122 times.
✗ Branch 4 → 7 not taken.
✓ Branch 5 → 6 taken 122 times.
✓ Branch 6 → 7 taken 1 time.
✓ Branch 6 → 8 taken 121 times.
✓ Branch 9 → 10 taken 1 time.
✓ Branch 9 → 11 taken 121 times.
|
122 | if (!task || task->rrule.isEmpty() || !supported(*task)) return false; |
| 127 |
3/3✓ Branch 11 → 12 taken 121 times.
✓ Branch 12 → 13 taken 2 times.
✓ Branch 12 → 14 taken 119 times.
|
121 | const QDateTime anchor = task->dtStart.isValid() ? task->dtStart : task->due; |
| 128 |
2/3✓ Branch 16 → 17 taken 121 times.
✗ Branch 17 → 18 not taken.
✓ Branch 17 → 19 taken 121 times.
|
121 | if (!anchor.isValid()) return false; |
| 129 | 121 | CalendarEvent event; | |
| 130 |
1/1✓ Branch 22 → 23 taken 121 times.
|
121 | event.uid = task->uid; event.dtStart = anchor; event.dtEnd = anchor.addSecs(60); |
| 131 |
3/3✓ Branch 25 → 26 taken 121 times.
✓ Branch 26 → 27 taken 2 times.
✓ Branch 26 → 28 taken 119 times.
|
121 | event.allDay = task->dtStart.isValid() ? task->startAllDay : task->dueAllDay; |
| 132 | 121 | event.rrule = task->rrule; | |
| 133 |
1/1✓ Branch 33 → 34 taken 121 times.
|
121 | const auto calendar = ICal::parseFirst(task->resourceIcal); |
| 134 |
1/1✓ Branch 36 → 37 taken 121 times.
|
121 | const ICalTime::ZoneResolver resolver(calendar); |
| 135 |
1/1✓ Branch 40 → 41 taken 121 times.
|
121 | const auto original = ICal::parseFirst(task->icalRaw, QStringLiteral("VTODO")); |
| 136 |
6/6✓ Branch 43 → 44 taken 121 times.
✓ Branch 44 → 45 taken 121 times.
✓ Branch 46 → 47 taken 121 times.
✓ Branch 47 → 48 taken 121 times.
✓ Branch 62 → 49 taken 11 times.
✓ Branch 62 → 63 taken 121 times.
|
132 | for (const auto &property : original.propertiesNamed("EXDATE")) |
| 137 |
6/6✓ Branch 50 → 51 taken 11 times.
✓ Branch 51 → 52 taken 11 times.
✓ Branch 52 → 53 taken 11 times.
✓ Branch 55 → 56 taken 11 times.
✓ Branch 58 → 54 taken 11 times.
✓ Branch 58 → 59 taken 11 times.
|
143 | for (const auto &value : ICalTime::parseList(property, resolver)) event.exdates << value.dateTime; |
| 138 |
6/6✓ Branch 64 → 65 taken 121 times.
✓ Branch 65 → 66 taken 121 times.
✓ Branch 67 → 68 taken 121 times.
✓ Branch 68 → 69 taken 121 times.
✓ Branch 83 → 70 taken 16 times.
✓ Branch 83 → 84 taken 121 times.
|
137 | for (const auto &property : original.propertiesNamed("RDATE")) |
| 139 |
6/6✓ Branch 71 → 72 taken 16 times.
✓ Branch 72 → 73 taken 16 times.
✓ Branch 73 → 74 taken 16 times.
✓ Branch 76 → 77 taken 16 times.
✓ Branch 79 → 75 taken 16 times.
✓ Branch 79 → 80 taken 16 times.
|
153 | for (const auto &value : ICalTime::parseList(property, resolver)) event.rdates << value.dateTime; |
| 140 |
1/1✓ Branch 85 → 86 taken 121 times.
|
121 | auto rule = RecurrenceRule::parse(task->rrule); |
| 141 | // COUNT needs the final original occurrence, not a fresh count after every advance. | ||
| 142 |
4/4✓ Branch 86 → 87 taken 121 times.
✓ Branch 87 → 88 taken 7 times.
✓ Branch 87 → 89 taken 114 times.
✓ Branch 90 → 91 taken 121 times.
|
121 | const QDate end = anchor.date().addYears(rule.count > 0 ? 100 : 10); |
| 143 | 121 | bool unknown = false; | |
| 144 |
1/1✓ Branch 91 → 92 taken 121 times.
|
121 | QDateTime next = nextAfter(event, anchor, end, &unknown); |
| 145 |
7/7✓ Branch 92 → 93 taken 121 times.
✓ Branch 93 → 94 taken 6 times.
✓ Branch 93 → 96 taken 115 times.
✓ Branch 94 → 95 taken 1 time.
✓ Branch 94 → 96 taken 5 times.
✓ Branch 97 → 98 taken 1 time.
✓ Branch 97 → 99 taken 120 times.
|
121 | if (!next.isValid() && unknown) return false; // not "series over" (S106-132) |
| 146 |
3/3✓ Branch 99 → 100 taken 120 times.
✓ Branch 100 → 101 taken 5 times.
✓ Branch 100 → 109 taken 115 times.
|
120 | if (!next.isValid()) { |
| 147 | 5 | task->status = QStringLiteral("COMPLETED"); task->percentComplete = 100; task->completedAt = now; | |
| 148 | 5 | return true; | |
| 149 | } | ||
| 150 | // The rule alone (no RDATE/EXDATE): COUNT counts rule occurrences before | ||
| 151 | // EXDATE removes any (RFC 5545 §3.3.10). | ||
| 152 | 115 | CalendarEvent ruleOnly = event; | |
| 153 |
1/1✓ Branch 110 → 111 taken 115 times.
|
115 | ruleOnly.exdates.clear(); |
| 154 |
1/1✓ Branch 111 → 112 taken 115 times.
|
115 | ruleOnly.rdates.clear(); |
| 155 | // "Is `next` a rule occurrence?" — the rule's occurrences up to `next` | ||
| 156 | // answer it (two days of margin for the display date of another zone). | ||
| 157 |
2/2✓ Branch 112 → 113 taken 115 times.
✓ Branch 113 → 114 taken 115 times.
|
115 | const QDate ruleEnd = qMin(end, next.date().addDays(2)); |
| 158 |
4/6✓ Branch 116 → 117 taken 115 times.
✓ Branch 119 → 120 taken 115 times.
✓ Branch 122 → 123 taken 115 times.
✓ Branch 122 → 124 taken 115 times.
✗ Branch 427 → 428 not taken.
✗ Branch 427 → 429 not taken.
|
345 | const auto ruleOccurrences = expandEventsForDisplay({ruleOnly}, anchor.date(), ruleEnd, false); |
| 159 |
2/2✓ Branch 125 → 126 taken 6 times.
✓ Branch 125 → 147 taken 109 times.
|
115 | if (rule.count > 0) { |
| 160 |
1/1✓ Branch 126 → 127 taken 6 times.
|
6 | const QDateTime last = lastCountedStart(ruleOnly, rule, end); |
| 161 |
3/3✓ Branch 127 → 128 taken 6 times.
✓ Branch 128 → 129 taken 1 time.
✓ Branch 128 → 130 taken 5 times.
|
6 | if (!last.isValid()) return false; |
| 162 | 5 | rule.count = 0; | |
| 163 |
4/4✓ Branch 130 → 131 taken 1 time.
✓ Branch 130 → 132 taken 4 times.
✓ Branch 132 → 133 taken 4 times.
✓ Branch 133 → 134 taken 5 times.
|
5 | rule.until = ICalTime::formatValue(event.allDay ? last : last.toUTC(), event.allDay); |
| 164 |
1/1✓ Branch 137 → 138 taken 5 times.
|
5 | task->rrule = rule.toString(); |
| 165 | 5 | ruleOnly.rrule = task->rrule; | |
| 166 | 6 | } | |
| 167 | // The wall-clock time the series means; it differs from the base's time | ||
| 168 | // only after a DST gap normalised it (TASK-RECUR-DST-GAP). | ||
| 169 | // S106-147: a malformed value (another client edited it) is ignored, not | ||
| 170 | // compared as an invalid time that wipes the task's dates. | ||
| 171 | const QTime storedWallTime = | ||
| 172 |
2/2✓ Branch 153 → 154 taken 114 times.
✓ Branch 154 → 155 taken 114 times.
|
228 | QTime::fromString(original.value(QStringLiteral("X-MAILJD-WALL-TIME")), QStringLiteral("HHmmss")); |
| 173 |
4/4✓ Branch 160 → 161 taken 114 times.
✓ Branch 161 → 162 taken 2 times.
✓ Branch 161 → 163 taken 112 times.
✓ Branch 163 → 164 taken 112 times.
|
114 | const QTime wallTime = storedWallTime.isValid() ? storedWallTime : anchor.time(); |
| 174 |
1/1✓ Branch 166 → 167 taken 114 times.
|
114 | const bool nextFromRule = std::any_of(ruleOccurrences.begin(), ruleOccurrences.end(), |
| 175 | 228 | [&next](const CalendarEvent &occurrence) { return occurrence.dtStart == next; }); | |
| 176 |
2/2✓ Branch 167 → 168 taken 7 times.
✓ Branch 167 → 193 taken 107 times.
|
114 | if (!nextFromRule) { |
| 177 | // TASK-RECUR-RDATE: the next occurrence only exists through an RDATE. | ||
| 178 | // Moving the base onto it would change the implicit pattern, so the rule | ||
| 179 | // is rewritten with the old base's parts made explicit — and only kept | ||
| 180 | // when it yields exactly the old rule's later occurrences. | ||
| 181 |
1/1✓ Branch 169 → 170 taken 7 times.
|
7 | const RecurrenceRule pinned = pinnedToBase(rule, anchor, wallTime, event.allDay); |
| 182 | 7 | CalendarEvent moved = ruleOnly; | |
| 183 | 7 | moved.dtStart = next; | |
| 184 |
1/1✓ Branch 173 → 174 taken 7 times.
|
7 | moved.dtEnd = next.addSecs(60); |
| 185 |
1/1✓ Branch 176 → 177 taken 7 times.
|
7 | moved.rrule = pinned.toString(); |
| 186 |
3/3✓ Branch 179 → 180 taken 7 times.
✓ Branch 180 → 181 taken 1 time.
✓ Branch 180 → 182 taken 6 times.
|
7 | if (!sameStartsAfter(moved, ruleOnly, next, end)) return false; |
| 187 | 6 | task->rrule = moved.rrule; | |
| 188 | 8 | } | |
| 189 | // A wall-clock time inside a DST gap is stored as the real time (03:30 for | ||
| 190 | // 02:30); the intended time is kept beside it and used again afterwards. | ||
| 191 | 113 | QString nextWallTime; | |
| 192 | // Only a rule that takes its whole time of day from the base can be in a | ||
| 193 | // gap: with BYMINUTE/BYSECOND the grid time differs legitimately (S106-146). | ||
| 194 |
8/8✓ Branch 194 → 195 taken 98 times.
✓ Branch 194 → 207 taken 9 times.
✓ Branch 196 → 197 taken 94 times.
✓ Branch 196 → 207 taken 4 times.
✓ Branch 198 → 199 taken 87 times.
✓ Branch 198 → 207 taken 7 times.
✓ Branch 200 → 201 taken 86 times.
✓ Branch 200 → 207 taken 1 time.
|
194 | if (nextFromRule && !event.allDay && timeFromBase(rule) && rule.byHour.isEmpty() && |
| 195 |
8/9✓ Branch 193 → 194 taken 107 times.
✓ Branch 193 → 207 taken 6 times.
✓ Branch 202 → 203 taken 86 times.
✗ Branch 202 → 207 not taken.
✓ Branch 203 → 204 taken 86 times.
✓ Branch 205 → 206 taken 4 times.
✓ Branch 205 → 207 taken 82 times.
✓ Branch 208 → 209 taken 4 times.
✓ Branch 208 → 228 taken 109 times.
|
307 | rule.byMinute.isEmpty() && rule.bySecond.isEmpty() && next.time() != wallTime) { |
| 196 |
3/3✓ Branch 209 → 210 taken 4 times.
✓ Branch 210 → 211 taken 4 times.
✓ Branch 211 → 212 taken 4 times.
|
4 | const QDateTime intended(next.date(), wallTime, next.timeZone()); |
| 197 |
3/3✓ Branch 213 → 214 taken 4 times.
✓ Branch 215 → 216 taken 2 times.
✓ Branch 215 → 217 taken 2 times.
|
4 | if (intended.time() == wallTime) next = intended; |
| 198 |
1/1✓ Branch 220 → 221 taken 2 times.
|
2 | else nextWallTime = wallTime.toString(QStringLiteral("HHmmss")); |
| 199 | 4 | } | |
| 200 |
2/3✓ Branch 228 → 229 taken 113 times.
✗ Branch 229 → 230 not taken.
✓ Branch 229 → 231 taken 113 times.
|
113 | if (!next.isValid()) return false; // never overwrite the dates with an invalid time |
| 201 | 113 | auto resource = calendar; | |
| 202 | 113 | bool instances = false; | |
| 203 |
6/6✓ Branch 232 → 233 taken 113 times.
✓ Branch 233 → 234 taken 113 times.
✓ Branch 235 → 236 taken 113 times.
✓ Branch 236 → 237 taken 113 times.
✓ Branch 256 → 238 taken 108 times.
✓ Branch 256 → 257 taken 113 times.
|
221 | for (const auto &component : resource.componentsNamed("VTODO")) |
| 204 |
9/20✓ Branch 239 → 240 taken 108 times.
✓ Branch 240 → 241 taken 108 times.
✓ Branch 242 → 243 taken 108 times.
✗ Branch 242 → 247 not taken.
✓ Branch 243 → 244 taken 108 times.
✓ Branch 244 → 245 taken 108 times.
✗ Branch 245 → 246 not taken.
✓ Branch 245 → 247 taken 108 times.
✓ Branch 248 → 249 taken 108 times.
✗ Branch 248 → 250 not taken.
✓ Branch 250 → 251 taken 108 times.
✗ Branch 250 → 252 not taken.
✓ Branch 252 → 253 taken 108 times.
✗ Branch 252 → 254 not taken.
✗ Branch 492 → 493 not taken.
✗ Branch 492 → 494 not taken.
✗ Branch 496 → 497 not taken.
✗ Branch 496 → 498 not taken.
✗ Branch 500 → 501 not taken.
✗ Branch 500 → 502 not taken.
|
221 | instances |= component.value("UID") == task->uid && component.hasProperty("RECURRENCE-ID"); |
| 205 |
1/2✗ Branch 258 → 259 not taken.
✓ Branch 258 → 297 taken 113 times.
|
113 | if (instances) { |
| 206 | ✗ | auto instance = original; | |
| 207 | ✗ | ICal::Property recurrence; recurrence.name = QStringLiteral("RECURRENCE-ID"); | |
| 208 | ✗ | ICalTime::writeProperty(&recurrence, anchor, event.allDay, ICalTime::zoneId(anchor, event.allDay)); | |
| 209 | ✗ | instance.setProperty(recurrence); instance.removeProperties("RRULE"); | |
| 210 | ✗ | instance.setPropertyValue("STATUS", "COMPLETED"); instance.setPropertyValue("PERCENT-COMPLETE", "100"); | |
| 211 | ✗ | instance.setPropertyValue("COMPLETED", ICalTime::formatValue(now.toUTC(), false)); | |
| 212 | ✗ | resource.components << instance; | |
| 213 | ✗ | task->resourceIcal = ICal::serialize(resource); | |
| 214 | ✗ | } | |
| 215 |
1/1✓ Branch 297 → 298 taken 113 times.
|
113 | const qint64 delta = anchor.secsTo(next); |
| 216 |
2/3✓ Branch 298 → 299 taken 113 times.
✓ Branch 299 → 300 taken 113 times.
✗ Branch 299 → 310 not taken.
|
113 | if (task->due.isValid()) { |
| 217 |
1/1✓ Branch 300 → 301 taken 113 times.
|
113 | const qint64 span = anchor.secsTo(task->due); |
| 218 |
7/7✓ Branch 301 → 302 taken 9 times.
✓ Branch 301 → 306 taken 104 times.
✓ Branch 302 → 303 taken 9 times.
✓ Branch 303 → 304 taken 9 times.
✓ Branch 304 → 305 taken 9 times.
✓ Branch 305 → 307 taken 9 times.
✓ Branch 306 → 307 taken 104 times.
|
113 | task->due = task->dueAllDay ? task->due.addDays(anchor.date().daysTo(next.date())) : next.addSecs(span); |
| 219 | } | ||
| 220 |
3/3✓ Branch 310 → 311 taken 113 times.
✓ Branch 311 → 312 taken 2 times.
✓ Branch 311 → 313 taken 111 times.
|
113 | if (task->dtStart.isValid()) task->dtStart = next; |
| 221 |
3/5✓ Branch 313 → 314 taken 113 times.
✓ Branch 314 → 315 taken 113 times.
✗ Branch 317 → 318 not taken.
✗ Branch 322 → 316 not taken.
✓ Branch 322 → 323 taken 113 times.
|
113 | for (auto &alarm : task->alarmTimes) alarm = alarm.addSecs(delta); |
| 222 | 113 | task->status = QStringLiteral("NEEDS-ACTION"); task->percentComplete = 0; task->completedAt = {}; | |
| 223 | 113 | auto raw = original; | |
| 224 |
4/4✓ Branch 333 → 334 taken 113 times.
✓ Branch 334 → 335 taken 113 times.
✓ Branch 335 → 336 taken 113 times.
✓ Branch 336 → 337 taken 113 times.
|
113 | raw.setPropertyValue("X-MAILJD-LAST-COMPLETED", ICalTime::formatValue(now.toUTC(), false)); |
| 225 |
3/3✓ Branch 341 → 342 taken 111 times.
✓ Branch 341 → 349 taken 2 times.
✓ Branch 345 → 346 taken 111 times.
|
224 | if (nextWallTime.isEmpty()) raw.removeProperties(QStringLiteral("X-MAILJD-WALL-TIME")); |
| 226 |
1/1✓ Branch 352 → 353 taken 2 times.
|
2 | else raw.setPropertyValue(QStringLiteral("X-MAILJD-WALL-TIME"), nextWallTime); |
| 227 |
2/2✓ Branch 356 → 357 taken 6 times.
✓ Branch 356 → 373 taken 107 times.
|
113 | if (!nextFromRule) { |
| 228 |
1/1✓ Branch 360 → 361 taken 6 times.
|
6 | raw.removeProperties(QStringLiteral("RRULE")); |
| 229 | 6 | ICal::Property rrule; | |
| 230 | 6 | rrule.name = QStringLiteral("RRULE"); | |
| 231 | 6 | rrule.value = task->rrule; | |
| 232 |
1/1✓ Branch 370 → 371 taken 6 times.
|
6 | raw.appendProperty(rrule); |
| 233 | 6 | } | |
| 234 |
1/1✓ Branch 373 → 374 taken 113 times.
|
113 | task->icalRaw = ICal::serialize(raw); |
| 235 | 113 | return true; | |
| 236 | 351 | } | |
| 237 | } | ||
| 238 |