fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept empty DESCRIPTION in ical import

Browse Source 
Adresses GitHub issue #274.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2020-04-03 20:34:20 +02:00 committed by Lukas Fleischer
parent 37d326cbe1
commit 214a761564
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ical.c
View File

@ -899,11 +899,6 @@ static char *ical_read_note(char *line, unsigned *noskipped,
ical_log(log, item_type, itemline, _("malformed description.")); ical_log(log, item_type, itemline, _("malformed description."));
(*noskipped)++; (*noskipped)++;
return NULL; return NULL;
} else if (strlen(notestr) == 0) {
mem_free(notestr);
ical_log(log, item_type, itemline, _("empty description."));
(*noskipped)++;
return NULL;
} else { } else {
note = generate_note(notestr); note = generate_note(notestr);
mem_free(notestr); mem_free(notestr);

5
test/ical-009.sh
View File

@ -10,11 +10,12 @@ if [ "$1" = 'actual' ]; then
echo "$out" | sed -n '4,5p' echo "$out" | sed -n '4,5p'
log=$(echo "$out" | awk '$1 == "See" {print $2}') log=$(echo "$out" | awk '$1 == "See" {print $2}')
cat "$log" | sed '1,17d' cat "$log" | sed '1,17d'
cat $PWD/.calcurse/notes/* | wc
rm -rf .calcurse || exit 1 rm -rf .calcurse || exit 1
elif [ "$1" = 'expected' ]; then elif [ "$1" = 'expected' ]; then
cat <<EOD cat <<EOD
Import process report: 0068 lines read 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 [12]: could not retrieve event start time.
VEVENT [17]: recurrence frequency not recognized. VEVENT [17]: recurrence frequency not recognized.
@ -24,9 +25,9 @@ VEVENT [32]: malformed exceptions line.
VEVENT [39]: line break in summary. VEVENT [39]: line break in summary.
VEVENT [44]: malformed description line. VEVENT [44]: malformed description line.
VEVENT [50]: malformed description. VEVENT [50]: malformed description.
VEVENT [56]: empty description.
VTODO [62]: malformed summary. VTODO [62]: malformed summary.
VTODO [66]: The ical file seems to be malformed. The end of item was not found. VTODO [66]: The ical file seems to be malformed. The end of item was not found.
1 0 1
EOD EOD
else else
./run-test "$0" ./run-test "$0"