Conversion of COUNT to UNTIL was a simple calculation which assumed one repetiton per period (day, week, month or year); it does not take exception days and invalid dates into account. Solved by a new function which returns the n'th occurrence of a recurrence rule. In calcurse UNTIL is interpreted as a day (DATE), in RFC 5545 as a time of day (DATE-TIME). This has implications when a recurrence rule has an occurrence on the UNTIL day, see comment in ical.c An "Import:" note is added when a multi-day event is imported and turned into a calcurse all-day event. Icalendar quotes in comments have been updated to RFC 5545. Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk> Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
29 lines
601 B
Bash
Executable File
29 lines
601 B
Bash
Executable File
#!/bin/sh
|
|
|
|
. "${TEST_INIT:-./test-init.sh}"
|
|
|
|
if [ "$1" = 'actual' ]; then
|
|
mkdir .calcurse || exit 1
|
|
cp "$DATA_DIR/conf" .calcurse || exit 1
|
|
"$CALCURSE" -D "$PWD/.calcurse" -i "$DATA_DIR/ical-005.ical"
|
|
"$CALCURSE" -D "$PWD/.calcurse" -s10/03/2013 -r3
|
|
cat "$PWD/.calcurse/notes"/*
|
|
rm -rf .calcurse || exit 1
|
|
elif [ "$1" = 'expected' ]; then
|
|
cat <<EOD
|
|
Import process report: 0023 lines read
|
|
0 apps / 4 events / 0 todos / 0 skipped
|
|
10/03/13:
|
|
* All day
|
|
* On day 1
|
|
* On day 2
|
|
* Two days
|
|
|
|
10/04/13:
|
|
* Two days
|
|
Import: multi-day event changed to one-day event
|
|
EOD
|
|
else
|
|
./run-test "$0"
|
|
fi
|