diff options
| author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2020-04-03 20:34:20 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2020-04-28 07:32:44 -0400 |
| commit | 214a761564e75abef1740738460288102a571a9b (patch) | |
| tree | 52878344f13dd1640460e48648184291c4ce8147 | |
| parent | 37d326cbe1b2285cbce8ae55aa953811864b11f8 (diff) | |
| download | calcurse-214a761564e75abef1740738460288102a571a9b.tar.gz calcurse-214a761564e75abef1740738460288102a571a9b.zip | |
Accept empty DESCRIPTION in ical import
Adresses GitHub issue #274.
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
| -rw-r--r-- | src/ical.c | 5 | ||||
| -rwxr-xr-x | test/ical-009.sh | 5 |
2 files changed, 3 insertions, 7 deletions
@@ -899,11 +899,6 @@ static char *ical_read_note(char *line, unsigned *noskipped, ical_log(log, item_type, itemline, _("malformed description.")); (*noskipped)++; return NULL; - } else if (strlen(notestr) == 0) { - mem_free(notestr); - ical_log(log, item_type, itemline, _("empty description.")); - (*noskipped)++; - return NULL; } else { note = generate_note(notestr); mem_free(notestr); diff --git a/test/ical-009.sh b/test/ical-009.sh index 9558f15..31dc283 100755 --- a/test/ical-009.sh +++ b/test/ical-009.sh @@ -10,11 +10,12 @@ if [ "$1" = 'actual' ]; then echo "$out" | sed -n '4,5p' log=$(echo "$out" | awk '$1 == "See" {print $2}') cat "$log" | sed '1,17d' + cat $PWD/.calcurse/notes/* | wc rm -rf .calcurse || exit 1 elif [ "$1" = 'expected' ]; then cat <<EOD Import process report: 0068 lines read -1 app / 0 events / 1 todo / 11 skipped +2 apps / 0 events / 1 todo / 10 skipped VEVENT [12]: could not retrieve event start time. VEVENT [17]: recurrence frequency not recognized. @@ -24,9 +25,9 @@ VEVENT [32]: malformed exceptions line. VEVENT [39]: line break in summary. VEVENT [44]: malformed description line. VEVENT [50]: malformed description. -VEVENT [56]: empty description. VTODO [62]: malformed summary. VTODO [66]: The ical file seems to be malformed. The end of item was not found. + 1 0 1 EOD else ./run-test "$0" |