d2791b046a
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>
47 lines
1.6 KiB
Bash
Executable File
47 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# Import with skipped items.
|
|
|
|
. "${TEST_INIT:-./test-init.sh}"
|
|
|
|
if [ "$1" = 'actual' ]; then
|
|
mkdir .calcurse || exit 1
|
|
cp "$DATA_DIR/conf" .calcurse || exit 1
|
|
out=$("$CALCURSE" -D "$PWD/.calcurse" -i "$DATA_DIR/ical-009.ical" 2>&1)
|
|
# Print the import report (stdout).
|
|
echo "$out" | awk '$1 == "Import"; $2 == "apps"'
|
|
# Find the log file and print the log messages (stderr).
|
|
logfile=$(echo "$out" | awk '$1 == "See" { print $2 }')
|
|
sed '1,18d' "$logfile"
|
|
# One empty note file.
|
|
cat "$PWD/.calcurse/notes"/* | wc | awk '{ print $1 $2 $3 }'
|
|
rm -rf .calcurse || exit 1
|
|
elif [ "$1" = 'expected' ]; then
|
|
cat <<EOD
|
|
Import process report: 0127 lines read
|
|
2 apps / 0 events / 1 todo / 20 skipped
|
|
VEVENT [12]: invalid or malformed event start time.
|
|
VEVENT [17]: rrule frequency not supported.
|
|
VEVENT [23]: malformed summary line.
|
|
VTODO [28]: item priority is invalid (must be between 0 and 9).
|
|
VEVENT [32]: malformed exceptions line.
|
|
VEVENT [39]: line break in summary.
|
|
VEVENT [44]: malformed description line.
|
|
VEVENT [50]: malformed description.
|
|
VTODO [62]: malformed summary.
|
|
VEVENT [66]: invalid status value.
|
|
VEVENT [72]: only one location allowed.
|
|
VEVENT [79]: invalid duration.
|
|
VEVENT [84]: invalid or malformed event start time.
|
|
VEVENT [89]: invalid end time value type.
|
|
VEVENT [94]: invalid until format.
|
|
VEVENT [100]: invalid exception date value type.
|
|
VEVENT [107]: invalid exception.
|
|
VEVENT [114]: either end or duration.
|
|
VEVENT [120]: end must be later than start.
|
|
VTODO [125]: The ical file seems to be malformed. The end of item was not found.
|
|
101
|
|
EOD
|
|
else
|
|
./run-test "$0"
|
|
fi
|