impr: handling of categories

src/awk/export.awk

@@ -1,24 +0,0 @@
-@include "lib/awk/icalendar.awk"
-
-BEGIN                     { FS = "[:;]"; }
-/^BEGIN:(VJOURNAL|VTODO)/ { type = $2 }
-/^END:/ && $2 == type     { exit }
-/^(CATEGORIES|DESCRIPTION|SUMMARY|DUE)/ { prop = $1; c[prop] = $0; next; }
-/^[^ ]/ && prop           { prop = ""; next; }
-/^ / && prop              { c[prop] = c[prop] substr($0, 2); next; }
-END {
-  if (!type)
-    exit
-  # Process content lines, force CATEGORIES and SUMMARY as single-line
-  c["CATEGORIES"]  = singleline(getcontent(c["CATEGORIES"]))
-  c["DESCRIPTION"] = getcontent(c["DESCRIPTION"])
-  c["SUMMARY"]     = singleline(getcontent(c["SUMMARY"]))
-  c["DUE"]         = getcontent(c["DUE"])
-  # Print
-  if (c["DUE"])
-    print "::: <| " substr(c["DUE"], 1, 4) "-" substr(c["DUE"], 5, 2) "-" substr(c["DUE"], 7, 2);
-  print "# " c["SUMMARY"];
-  print "> " c["CATEGORIES"];
-  print "";
-  print c["DESCRIPTION"];
-}

src/awk/get.awk

@@ -1,7 +1,17 @@
+# Retrieve content from iCalendar file
+#
+# Mandatory variable: `field`.
+# Name of field to retrieve.
+#
+# Optional variable: `format`.
+# If `format` is set to "csv", then the content is interpreted as
+# comma-separated values, and empty values are dropped.
+# If `format` is set to "date", then the content is interpreted as
+# a date the output is in the form YYYY-MM-DD.
 @include "lib/awk/icalendar.awk"
 
 # print content of field `field`
-BEGIN                     { FS = ":"; regex = "^" field; }
+BEGIN                     { FS = ":"; ORS = ""; regex = "^" field; }
 /^BEGIN:(VJOURNAL|VTODO)/ { type = $2 }
 /^END:/ && $2 == type     { exit }
 $0 ~ field                { line = $0;                 next; }
@@ -10,5 +20,22 @@ $0 ~ field                { line = $0;                 next; }
 END {
   if (!type) { exit }
   # Process line
-  print getcontent(line)
+  content = getcontent(line)
+  switch (format) {
+    case "csv" : 
+      split(content, a, ",")
+      for (i in a) {
+        if (a[i])
+          res = res "," a[i]
+      }
+      print substr(res, 2)
+      break
+    case "date" : 
+      if (content)
+        print substr(parse_dt("", content), 1, 10)
+      break
+    default :
+      print content
+      break
+  }
 }

src/awk/list.awk

@@ -131,6 +131,12 @@ ENDFILE {
   # Process content lines
   # strings
   cat = singleline(unescape(getcontent(c["CATEGORIES"])))
+  split(cat, a, ",")
+  cat = ""
+  for (i in a)
+    if (a[i])
+      cat = cat "," a[i]
+  cat = substr(cat, 2)
   sta = singleline(unescape(getcontent(c["STATUS"])))
   sum = singleline(unescape(getcontent(c["SUMMARY"])))
 

src/awk/new.awk

@@ -6,23 +6,34 @@ BEGIN {
 }
 desc                 { desc = desc "\\n" escape($0);                      next; }
 /^::: \|>/ && !start { gsub("\"", ""); start = substr(zulu, 1, 8);        next; }
-/^::: <\| / && !due  { gsub("\"", ""); due = substr($0, 8);           next; }
+/^::: <\|/ && !due   { gsub("\"", ""); due = "D" substr($0, 8);           next; }
-/^# / && !summary    { summary = escape(substr($0, 3));               next; }
+/^# / && !summary    { summary = "S" escape(substr($0, 3));               next; }
-/^> / && !categories { categories = escape_but_commas(substr($0, 3)); next; }
+/^> / && !categories { categories = "C" escape_but_commas(substr($0, 3)); next; }
 !$0 && !el           { el = 1;                                        next; }
 !el                  { print "Unrecognized header on line "NR": " $0 > "/dev/stderr"; exit 1; }
                      { desc = "D" escape($0);                             next; }
 END {
   # Sanitize input
   type = due ? "VTODO" : "VJOURNAL"
+  due = substr(due, 2)
+  summary = substr(summary, 2)
+  categories = substr(categories, 2)
+  desc = substr(desc, 2)
+  if (categories) {
+    split(categories, a, ",")
+    categories = ""
+    for (i in a)
+      if (a[i])
+        categories = categories "," a[i]
+    categories = substr(categories, 2)
+  }
   if (due) {
     # Use command line `date` for parsing
     cmd = "date -d \"" due "\" +\"%Y%m%d\"";
-    suc = cmd | getline res
+    suc = cmd | getline due
     close(cmd)
     if (suc != 1)
       exit 1
-    due = res ? res : ""
   }
 
   # print ical
@@ -52,7 +63,7 @@ END {
   }
   if (summary)    print_fold("SUMMARY:",     summary);
   if (categories) print_fold("CATEGORIES:",  categories);
-  if (desc)       print_fold("DESCRIPTION:", substr(desc, 2));
+  if (desc)       print_fold("DESCRIPTION:", desc);
   print "END:" type;
   print "END:VCALENDAR"
 }

src/awk/update.awk

@@ -6,21 +6,34 @@ BEGIN {
 }
 
 ENDFILE { 
-  if (NR == FNR && due) {
+  if (NR == FNR) {
+    due = substr(due, 2)
+    summary = substr(summary, 2)
+    categories = substr(categories, 2)
+    desc = substr(desc, 2)
+    if (categories) {
+      split(categories, a, ",")
+      categories = ""
+      for (i in a)
+        if (a[i])
+          categories = categories "," a[i]
+      categories = substr(categories, 2)
+    }
+    if (due) {
       # Use command line `date` for parsing
       cmd = "date -d \"" due "\" +\"%Y%m%d\"";
-    suc = cmd | getline res
+      suc = cmd | getline due
       close(cmd)
       if (suc != 1)
         exit 1
-    due = res ? res : ""
+    }
   }
 }
 
 NR == FNR && desc                 { desc = desc "\\n" escape($0);                      next; }
-NR == FNR && /^::: <\| / && !due  { gsub("\"",""); due = substr($0, 8);            next; }
+NR == FNR && /^::: <\|/ && !due   { gsub("\"",""); due = "D" substr($0, 8);            next; }
-NR == FNR && /^# / && !summary    { summary = escape(substr($0, 3));               next; }
+NR == FNR && /^# / && !summary    { summary = "S" escape(substr($0, 3));               next; }
-NR == FNR && /^> / && !categories { categories = escape_but_commas(substr($0, 3)); next; }
+NR == FNR && /^> / && !categories { categories = "C" escape_but_commas(substr($0, 3)); next; }
 NR == FNR && !$0 && !el           { el = 1;                                            next; }
 NR == FNR && !el                  { print "Unrecognized header on line "NR": " $0 > "/dev/stderr"; exit 1; }
 NR == FNR                         { desc = "D" escape($0);                             next; }
@@ -37,7 +50,7 @@ due && type == "VJOURNAL"         { print "Notes and journal entries do not have
   if (due) print "DUE;VALUE=DATE:" due;
   print_fold("SUMMARY:",     summary);
   print_fold("CATEGORIES:",  categories);
-  print_fold("DESCRIPTION:", substr(desc, 2));
+  print_fold("DESCRIPTION:", desc);
   type = "";
 }
 { print }

src/lib/awk/icalendar.awk

@@ -104,8 +104,11 @@ function getcontent(str) {
 # @local variables: tz
 # @input dt_param: iCalendar DTSTART or DTEND parameter string
 # @input dt_content: iCalendar DTSTART or DTEND content string
-# @return: date or date-time string that can be used in date (1)
+# @return: date or date-time string that can be used in date (1). In
-function parse_dt(dt_param, dt_content,    tz, a, i, k) {
+#          particular, date strings are of the form YYYY-MM-DD and datetime
+#          strings are of the form YYYY-MM-DD HH:MM:SS[Z]. If the field
+#          containts timezone information, then this is prepended.
+function parse_dt(dt_param, dt_content,    tz, a, i, k, date, time) {
   if (dt_param) {
     split(dt_param, a, ";")
     for (i in a) {
@@ -117,9 +120,9 @@ function parse_dt(dt_param, dt_content,    tz, a, i, k) {
     }
   }
   # Get date/date-time
-  return length(dt_content) == 8 ?
+  date = substr(dt_content, 1, 4) "-" substr(dt_content, 5, 2) "-" substr(dt_content, 7, 2)
-    dt dt_content :
+  time = length(dt_content) == 8 ? "" : " " substr(dt_content, 10, 2) ":" substr(dt_content, 12, 2) ":" substr(dt_content, 14)
-    dt gensub(/^([0-9]{8})T([0-9]{2})([0-9]{2})([0-9]{2})(Z)?$/, "\\1 \\2:\\3:\\4\\5", "g", dt_content)
+  return tz date time
 }
 
 # Map iCalendar duration specification into the format to be used in date (1).

src/sh/awkscripts.sh

@@ -5,13 +5,6 @@ EOF
 )
 export AWK_ALTERTODO
 
-AWK_EXPORT=$(
-  cat <<'EOF'
-@@include awk/export.awk
-EOF
-)
-export AWK_EXPORT
-
 AWK_GET=$(
   cat <<'EOF'
 @@include awk/get.awk

src/sh/icalendar.sh

@@ -42,7 +42,16 @@ __edit() {
   file="$1"
   shift
   tmpmd=$(mktemp --suffix='.md')
-  awk "$AWK_EXPORT" "$file" >"$tmpmd"
+  due=$(awk -v field="DUE" -v format="date" "$AWK_GET" "$file")
+  if [ -n "$due" ]; then
+    echo "::: <| $due" >"$tmpmd"
+  fi
+  {
+    echo "# $(awk -v field="SUMMARY" "$AWK_GET" "$file" | tr '\n' ' ')"
+    echo "> $(awk -v field="CATEGORIES" -v format="csv" "$AWK_GET" "$file" | tr '\n' ' ')"
+    echo ""
+    awk -v field="DESCRIPTION" "$AWK_GET" "$file"
+  } >>"$tmpmd"
   checksum=$(cksum "$tmpmd")
 
   # Open in editor