amin/fzf-vcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: escaping and iCalendar updates

Browse Source
This commit is contained in:
Ämin Baumeler 2025-06-17 12:40:14 +02:00
parent 4d0148e2a3
commit 81c1f94daf
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/awk/update.awk
View File

@ -92,13 +92,10 @@ ENDFILE {
if (suc != 1) { if (suc != 1) {
exit 1 exit 1
} }
summary = escape(summary)
location = escape(location)
desc = escape(desc)
} }
} }
NR == FNR && desc { desc = desc "\\n" $0; next } NR == FNR && desc { desc = desc "\\n" escape($0); next }
NR == FNR { NR == FNR {
from = substr($0, 1, 6) == "::: |>" ? substr($0, 8) : "" from = substr($0, 1, 6) == "::: |>" ? substr($0, 8) : ""
if (!from) if (!from)
@ -108,22 +105,17 @@ NR == FNR {
if (!to) if (!to)
exit 1 exit 1
getline getline
location = substr($0, 1, 2) == "@ " ? substr($0, 3) : "" location = substr($0, 1, 2) == "@ " ? escape(substr($0, 3)) : ""
if (location) getline if (location) getline
summary = substr($0, 1, 2) == "# " ? substr($0, 3) : "" summary = substr($0, 1, 2) == "# " ? escape(substr($0, 3)) : ""
if (!summary) if (!summary)
exit 1 exit 1
getline # This line should be empty getline # This line should be empty
getline # First line of description getline # First line of description
desc = $0 desc = escape($0)
next next
} }
/^BEGIN:VEVENT$/ { inside = 1; print; next }
/^X-ALT-DESC/ && inside { next } # drop this alternative description
/^ / && inside { next } # drop this folded line (the only content with folded lines will be updated)
/^(DTSTART|DTEND|SUMMARY|LOCATION|CATEGORIES|DESCRIPTION|LAST-MODIFIED)/ && inside { next } # skip for now, we will write updated fields at the end
/^SEQUENCE/ && inside { seq = $2; next } # store sequence number and skip
/^END:VEVENT$/ { /^END:VEVENT$/ {
seq = seq ? seq + 1 : 1 seq = seq ? seq + 1 : 1
print "SEQUENCE:" seq print "SEQUENCE:" seq
@ -135,4 +127,10 @@ NR == FNR {
print_fold("LOCATION:", location) print_fold("LOCATION:", location)
inside = "" inside = ""
} }
/^BEGIN:VEVENT$/ { inside = 1 }
/^ / && skipf { next } # drop this folded line
/^[^ ]/ && skipf { skipf = 0 }
/^(DTSTART|DTEND|SUMMARY|LOCATION|CATEGORIES|DESCRIPTION|LAST-MODIFIED|X-ALT-DESC)/ && inside { skipf = 1; next } # skip for now, we will write updated fields at the end
/^X-ALT-DESC/ && inside { skipf = 1; next } # skip
/^SEQUENCE/ && inside { seq = $2; next } # store sequence number and skip
{ print } { print }