fabacecd16
The patch derives the item type (appointment or event) from the DTSTART value type. It is then used to perform an extended check of date/time values and reject non-conformant import files (like those reported in Github issues #81, (calcurse) events. The patch includes parsing and code corrections and minor refactoring. Background: Ical events are of two types, in calcurse called appointments and events. RFC 5545 has no distinguishing names for them, but describes them in section 3.6.1. The event type is derived from the value type of the DTSTART property. The value type may be either DATE-TIME (appointment) or DATE (event). If not specified by a VALUE property parameter in DTSTART, the default value type is DATE-TIME. The value type must be set explicitly to DATE to get an event. Other properties and rrule parts must agree with the DTSTART value type (DTEND, DURATION, EXDATE and UNTIL). Previously the type of an imported event was derived from the format of the DTSTART value. The DTSTART value type was not taken into account when importing, and not specified for recurring events when exporting (commit 0114289 solved it for events, see GitHub PR #97). Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
45 lines
1.5 KiB
Bash
Executable File
45 lines
1.5 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: 0116 lines read
|
|
2 apps / 0 events / 1 todo / 18 skipped
|
|
VEVENT [12]: invalid or malformed event start time.
|
|
VEVENT [17]: recurrence frequency not recognized.
|
|
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.
|
|
VTODO [114]: The ical file seems to be malformed. The end of item was not found.
|
|
101
|
|
EOD
|
|
else
|
|
./run-test "$0"
|
|
fi
|