feat: git support

README.md

@@ -13,14 +13,22 @@ with a CalDav server, such as [Radicale](https://radicale.org/), and a synchroni
 
 Installation
 ------------
-Download the file `fzf-vjour` from the [latest release](https://github.com/baumea/fzf-vjour/releases/latest), or run `./scripts/build.sh`, then
-copy `fzf-vjour` to your preferred location, e.g., `~/.local/bin`, and make it executable.
+
+### Manual
+
+Run `./scripts/build.sh`, then copy `fzf-vjour` to your preferred location, e.g., `~/.local/bin`, and make it executable.
 
 ### Requirements
 This is a POSIX script with inline `awk` elements.
 Make sure you have [fzf](https://github.com/junegunn/fzf) installed.
 I also suggest to install [batcat](https://github.com/sharkdp/bat) for colorful previews.
 
+### Arch Linux
+
+```bash
+yay -S fzf-vjour-git
+```
+
 Configuration
 --------------
 This application is configured with a file located at `$HOME/.config/fzf-vjour/config`.
@@ -83,6 +91,16 @@ In addition, there are the following keybindings:
 
 You may also invoke the script with `--help` to see further command-line options. 
 
+Limitations
+-----------
+Here is a list of some currently present limitations.
+
+- Timezone agnostic: Timezone specifications are ignored.
+- Time agnostic: We use the date portion only of date-time specifications.
+- No alarms or notifications
+- No attachments
+- No recurrences
+
 License
 -------
 This project is licensed under the [MIT License](./LICENSE).

src/awk/export.awk

@@ -1,34 +1,53 @@
-function getcontent(content_line, prop)
-{
-  return substr(content_line[prop], index(content_line[prop], ":") + 1);
-}
-
-function storetext_line(content_line, c, prop)
-{
-  c[prop] = getcontent(content_line, prop);
-  gsub("\\\\n",    "\n", c[prop]);
-  gsub("\\\\N",    "\n", c[prop]);
-  gsub("\\\\,",    ",",  c[prop]);
-  gsub("\\\\;",    ";",  c[prop]);
-  gsub("\\\\\\\\", "\\", c[prop]);
-}
-
-BEGIN                                   { FS = "[:;]"; }
-/^BEGIN:(VJOURNAL|VTODO)/               { type = $2 }
-/^END:/ && $2 == type                   { exit }
-/^(CATEGORIES|DESCRIPTION|SUMMARY|DUE)/ { prop = $1; content_line[prop] = $0;                               next; }
-/^[^ ]/ && prop                         { prop = "";                                                        next; }
-/^ / && prop                            {            content_line[prop] = content_line[prop] substr($0, 2); next; }
-
-END {
-  if (!type) {
-    exit
+# unescape
+# Isolate and unescape the content part of an iCalendar line.
+#
+# @local variables: i, c, c2, res
+# @input str: String
+# @return: Unescaped string
+function unescape(str,    i, c, c2, res) {
+  for(i=1; i<=length(str);i++) {
+    c = substr(str, i, 1)
+    if (c != "\\") {
+      res = res c
+      continue
+    }
+    i++
+    c2 = substr(str, i, 1)
+    if (c2 == "n" || c2 == "N") {
+      res = res "\n"
+      continue
+    }
+    # Alternatively, c2 is "\\" or "," or ";". In each case, append res with
+    # c2. If the strings has been escaped correctly, then the character c2
+    # cannot be anything else. To be fail-safe, simply append res with c2.
+    res = res c2
   }
+  return res
+}
+
+# getcontent
+# Isolate content part of an iCalendar line, and unescape.
+#
+# @input str: String
+# @return: Unescaped content part
+function getcontent(str) {
+  return unescape(substr(str, index(str, ":") + 1))
+}
+
+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
-  storetext_line(content_line, c, "CATEGORIES" );
-  storetext_line(content_line, c, "DESCRIPTION");
-  storetext_line(content_line, c, "SUMMARY"    );
-  storetext_line(content_line, c, "DUE"        );
+  c["CATEGORIES"]  = getcontent(c["CATEGORIES"])
+  c["DESCRIPTION"] = getcontent(c["DESCRIPTION"])
+  c["SUMMARY"]     = 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);

src/awk/get.awk

@@ -1,18 +1,48 @@
+# unescape
+# Isolate and unescape the content part of an iCalendar line.
+#
+# @local variables: i, c, c2, res
+# @input str: String
+# @return: Unescaped string
+function unescape(str,    i, c, c2, res) {
+  for(i=1; i<=length(str);i++) {
+    c = substr(str, i, 1)
+    if (c != "\\") {
+      res = res c
+      continue
+    }
+    i++
+    c2 = substr(str, i, 1)
+    if (c2 == "n" || c2 == "N") {
+      res = res "\n"
+      continue
+    }
+    # Alternatively, c2 is "\\" or "," or ";". In each case, append res with
+    # c2. If the strings has been escaped correctly, then the character c2
+    # cannot be anything else. To be fail-safe, simply append res with c2.
+    res = res c2
+  }
+  return res
+}
+
+# getcontent
+# Isolate content part of an iCalendar line, and unescape.
+#
+# @input str: String
+# @return: Unescaped content part
+function getcontent(str) {
+  return unescape(substr(str, index(str, ":") + 1))
+}
+
 # print content of field `field`
 BEGIN                     { FS = ":"; regex = "^" field; }
 /^BEGIN:(VJOURNAL|VTODO)/ { type = $2 }
 /^END:/ && $2 == type     { exit }
-$0 ~ field                { content = $0;                    next; }
-/^ / && content           { content = content substr($0, 2); next; }
-/^[^ ]/ && content        { exit }
+$0 ~ field                { line = $0;                 next; }
+/^ / && line              { line = line substr($0, 2); next; }
+/^[^ ]/ && line           { exit }
 END {
   if (!type) { exit }
-  # Process content line
-  content = substr(content, index(content, ":") + 1);
-  gsub("\\\\n",    "\n", content);
-  gsub("\\\\N",    "\n", content);
-  gsub("\\\\,",    ",",  content);
-  gsub("\\\\;",    ";",  content);
-  gsub("\\\\\\\\", "\\", content);
-  print content;
+  # Process line
+  print getcontent(line)
 }

src/awk/list.awk

@@ -3,39 +3,57 @@
 # See https://datatracker.ietf.org/doc/html/rfc5545 for the RFC 5545 that
 # describes iCalendar, and its syntax
 
-function getcontent(content_line, prop)
-{
-  return substr(content_line[prop], index(content_line[prop], ":") + 1);
+# Make string single-line
+#
+# @input str: String
+# @return: String without newlines
+function singleline(str) {
+  gsub("\\n", " ", str)
+  return str
 }
 
-function storetext_line(content_line, c, prop)
-{
-  c[prop] = getcontent(content_line, prop);
-  gsub("\\\\n",    " ",  c[prop]);
-  gsub("\\\\N",    " ",  c[prop]);
-  gsub("\\\\,",    ",",  c[prop]);
-  gsub("\\\\;",    ";",  c[prop]);
-  gsub("\\\\\\\\", "\\", c[prop]);
-  #gsub(" ",    "_",  c[prop]);
+# Isolate and unescape the content part of an iCalendar line.
+#
+# @local variables: i, c, c2, res
+# @input str: String
+# @return: Unescaped string
+function unescape(str,    i, c, c2, res) {
+  for(i=1; i<=length(str);i++) {
+    c = substr(str, i, 1)
+    if (c != "\\") {
+      res = res c
+      continue
+    }
+    i++
+    c2 = substr(str, i, 1)
+    if (c2 == "n" || c2 == "N") {
+      res = res "\n"
+      continue
+    }
+    # Alternatively, c2 is "\\" or "," or ";". In each case, append res with
+    # c2. If the strings has been escaped correctly, then the character c2
+    # cannot be anything else. To be fail-safe, simply append res with c2.
+    res = res c2
+  }
+  return res
 }
 
-function storeinteger(content_line, c, prop)
-{
-  c[prop] = getcontent(content_line, prop);
-  c[prop] = c[prop] ? c[prop] : 0;
+# Isolate content part of an iCalendar line, and unescape.
+#
+# @input str: String
+# @return: Unescaped content part
+function getcontent(str) {
+  return unescape(substr(str, index(str, ":") + 1))
 }
 
-function storedatetime(content_line, c, prop)
-{
-  c[prop] = getcontent(content_line, prop);
-}
-
-function storedate(content_line, c, prop)
-{
-  c[prop] = substr(getcontent(content_line, prop), 1, 8);
-}
-
-function formatdate(date, today, todaystamp,       ts, ts_y, ts_m, ts_d, delta)
+# formatdate
+# Generate kind-of-pretty date strings.
+#
+# @local variables: ts, ts_y, ts_m, ts_d, delta
+# @input date: Date in the format YYYYMMDD
+# @input todaystamp: Today, seconds since epoch
+# @return: string
+function formatdate(date, todaystamp,       ts, ts_y, ts_m, ts_d, delta)
 {
   ts_y = substr(date, 1, 4);
   ts_m = substr(date, 5, 2);
@@ -87,7 +105,6 @@ BEGIN {
   RED = "\033[1;31m";
   WHITE = "\033[1;97m";
   CYAN = "\033[1;36m";
-  FAINT = "\033[2m";
   OFF = "\033[m";
 
   # For date comparision
@@ -99,9 +116,7 @@ BEGIN {
 BEGINFILE {
   type = "";
   prop = "";
-  delete content_line;
   delete c;
-
 }
 
 /^BEGIN:(VJOURNAL|VTODO)/ {
@@ -114,7 +129,7 @@ BEGINFILE {
 
 /^(CATEGORIES|DESCRIPTION|PRIORITY|STATUS|SUMMARY|COMPLETED|DUE|DTSTART|DURATION|CREATED|DTSTAMP|LAST-MODIFIED)/ {
   prop = $1;
-  content_line[prop] = $0;
+  c[prop] = $0;
   next;
 }
 /^[^ ]/ && prop {
@@ -122,7 +137,7 @@ BEGINFILE {
   next;
 }
 /^ / && prop {
-  content_line[prop] = content_line[prop] substr($0, 2); 
+  c[prop] = c[prop] substr($0, 2); 
   next; 
 }
 
@@ -146,26 +161,34 @@ ENDFILE {
   collection = collection in collection2label ? collection2label[collection] : collection;
 
   # Process content lines
-  storetext_line(content_line, c, "CATEGORIES"   );
-  storetext_line(content_line, c, "DESCRIPTION"  );
-  storeinteger(  content_line, c, "PRIORITY"     );
-  storetext_line(content_line, c, "STATUS"       );
-  storetext_line(content_line, c, "SUMMARY"      );
-  storedatetime( content_line, c, "COMPLETED"    );
-  storedate(     content_line, c, "DUE"          );
-  storedate(     content_line, c, "DTSTART"      );
-  storedatetime( content_line, c, "DURATION"     );
-  storedatetime( content_line, c, "CREATED"      );
-  storedatetime( content_line, c, "DTSTAMP"      );
-  storedatetime( content_line, c, "LAST-MODIFIED");
+  # strings
+  cat = singleline(unescape(getcontent(c["CATEGORIES"])))
+  des = singleline(unescape(getcontent(c["DESCRIPTION"])))
+  sta = singleline(unescape(getcontent(c["STATUS"])))
+  sum = singleline(unescape(getcontent(c["SUMMARY"])))
+
+  # integers
+  pri = unescape(getcontent(c["PRIORITY"]))
+  pri = pri ? pri + 0 : 0
+
+  # dates
+  due = substr(unescape(getcontent(c["DUE"])), 1, 8)
+  dts = substr(unescape(getcontent(c["DTSTART"])), 1, 8)
+  
+  # date-times
+  com = unescape(getcontent(c["COMPLETED"]))
+  dur = unescape(getcontent(c["DURATION"]))
+  cre = unescape(getcontent(c["CREATED"]))
+  stp = unescape(getcontent(c["DTSTAMP"]))
+  lmd = unescape(getcontent(c["LAST-MODIFIED"]))
 
   # Priority field, primarly used for sorting
-  priotext = "";
-  prio = 0;
-  if (c["PRIORITY"] > 0)
+  psort = 0;
+  priotext = ""
+  if (pri > 0)
   {
-    priotext = "❗(" c["PRIORITY"] ") ";
-    prio = 10 - c["PRIORITY"];
+    priotext = "❗(" pri ") "
+    psort = 10 - pri
   }
 
   # Last modification/creation time stamp, used for sorting
@@ -173,7 +196,7 @@ ENDFILE {
   #                UTC time format
   # DTSTAMP:       mandatory field in VTODO and VJOURNAL, date-time in UTC time
   #                format
-  mod = c["LAST-MODIFIED"] ? c["LAST-MODIFIED"] : c["DTSTAMP"];
+  mod = lmd ? lmd : stp
 
   # Date field. For VTODO entries, we show the due date, for journal entries,
   # the associated date.
@@ -183,38 +206,37 @@ ENDFILE {
   if (type == "VTODO")
   {
     # Either DUE or DURATION may appear. If DURATION appears, then also DTSTART
-    d = c["DUE"] ? c["DUE"] : 
-      (c["DURATION"] ? c["DTSTART"] " for " c["DURATION"] : "");
-    if (d && d <= today && c["STATUS"] != "COMPLETED")
+    d = due ? due : (dur ? dts " for " dur : "");
+    if (d && d <= today && sta != "COMPLETED")
     {
       datecolor = RED;
       summarycolor = RED;
     }
   } else {
-    d = c["DTSTART"];
+    d = dts
   }
-  d = d ? formatdate(d, today, todaystamp       ts, ts_y, ts_m, ts_d, delta) : "              ";
+  d = d ? formatdate(d, todaystamp) : "              ";
 
   # flag: - "journal"   for VJOURNAL with DTSTART
   #       - "note"      for VJOURNAL without DTSTART
   #       - "completed" for VTODO with c["STATUS"] == COMPLETED
   #       - "open"      for VTODO with c["STATUS"] != COMPLETED
   if (type == "VTODO")
-    flag = c["STATUS"] == "COMPLETED" ? flag_completed : flag_open;
+    flag = sta == "COMPLETED" ? flag_completed : flag_open;
   else
-    flag = c["DTSTART"] ? flag_journal : flag_note;
+    flag = dts ? flag_journal : flag_note;
   
   # summary
   # c["SUMMARY"]
-  summary = c["SUMMARY"] ? c["SUMMARY"] : " "
+  summary = sum ? sum : " "
 
   # categories
-  categories = c["CATEGORIES"] ? c["CATEGORIES"] : " "
+  categories = cat ? cat : " "
 
   # filename
   # FILENAME
 
-  print prio,
+  print psort,
         mod,
         fpath,
         collection,

src/awk/new.awk

@@ -1,27 +1,44 @@
-function escape_categories(str)
-{
-  gsub("\\\\", "\\\\", str);
-  gsub(";",  "\\\\;",    str);
-}
-
+# Escape string to be used as content in iCalendar files.
+#
+# @input str: String to escape
+# @return: Escaped string
 function escape(str)
 {
-  escape_categories(str)
-  gsub(",",  "\\\\,",    str);
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  gsub(",",    "\\,",  str)
+  return str
 }
 
+# Escape string to be used as content in iCalendar files.
+#
+# @input str: String to escape
+# @return: Escaped string
+function escape_categories(str)
+{
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  return str
+}
+
+# Print property with its content and fold according to the iCalendar
+# specification.
+#
+# @local variables: i, s
+# @input nameparam: Property name with optional parameters
+# @input content: Escaped content
 function print_fold(nameparam, content,    i, s)
 {
-  i = 74 - length(nameparam);
-  s = substr(content, 1, i);
-  print nameparam s;
-  s = substr(content, i+1, 73);
-  i = i + 73;
+  i = 74 - length(nameparam)
+  s = substr(content, 1, i)
+  print nameparam s
+  s = substr(content, i+1, 73)
+  i = i + 73
   while (s)
   {
-    print " " s;
-    s = substr(content, i+1, 73);
-    i = i + 73;
+    print " " s
+    s = substr(content, i+1, 73)
+    i = i + 73
   }
 }
 
@@ -30,7 +47,7 @@ BEGIN {
   type = "VJOURNAL"; 
   zulu = strftime("%Y%m%dT%H%M%SZ", systime(), 1);
 }
-desc { desc = desc "\\n" $0; next; }
+desc { desc = desc "\\n" escape($0); next; }
 {
   if (substr($0, 1, 6) == "::: |>")
   {
@@ -43,12 +60,12 @@ desc { desc = desc "\\n" $0; next; }
     due = substr($0, 8);
     getline;
   }
-  summary = substr($0, 1, 2) != "# " ? "" : substr($0, 3);
+  summary = substr($0, 1, 2) != "# " ? "" : escape(substr($0, 3));
   getline;
-  categories = substr($0, 1, 1) != ">" ? "" : substr($0, 3);
+  categories = substr($0, 1, 1) != ">" ? "" : escape(substr($0, 3));
   getline; # This line should be empty
   getline; # First line of description
-  desc = $0;
+  desc = escape($0);
   next;
 }
 END {
@@ -59,9 +76,6 @@ END {
     cmd | getline res
     due = res ? res : ""
   }
-  escape(summary);
-  escape(desc);
-  escape_categories(categories);
 
   # print ical
   print "BEGIN:VCALENDAR";
@@ -88,9 +102,9 @@ END {
     if (start)
       print "DTSTART;VALUE=DATE:" start;
   }
-  if (summary)    print_fold("SUMMARY:",     summary,       i, s);
-  if (categories) print_fold("CATEGORIES:",  categories,    i, s);
-  if (desc)       print_fold("DESCRIPTION:", desc,          i, s);
+  if (summary)    print_fold("SUMMARY:",     summary);
+  if (categories) print_fold("CATEGORIES:",  categories);
+  if (desc)       print_fold("DESCRIPTION:", desc);
   print "END:" type;
   print "END:VCALENDAR"
 }

src/awk/update.awk

@@ -1,32 +1,44 @@
-function getcontent(content_line, prop)
-{
-  return substr(content_line[prop], index(content_line[prop], ":") + 1);
-}
-
-function escape_categories(str)
-{
-  gsub("\\\\", "\\\\", str);
-  gsub(";",  "\\\\;",    str);
-}
-
+# Escape string to be used as content in iCalendar files.
+#
+# @input str: String to escape
+# @return: Escaped string
 function escape(str)
 {
-  escape_categories(str)
-  gsub(",",  "\\\\,",    str);
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  gsub(",",    "\\,",  str)
+  return str
 }
 
+# Escape string to be used as content in iCalendar files.
+#
+# @input str: String to escape
+# @return: Escaped string
+function escape_categories(str)
+{
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  return str
+}
+
+# Print property with its content and fold according to the iCalendar
+# specification.
+#
+# @local variables: i, s
+# @input nameparam: Property name with optional parameters
+# @input content: Escaped content
 function print_fold(nameparam, content,    i, s)
 {
-  i = 74 - length(nameparam);
-  s = substr(content, 1, i);
-  print nameparam s;
-  s = substr(content, i+1, 73);
-  i = i + 73;
+  i = 74 - length(nameparam)
+  s = substr(content, 1, i)
+  print nameparam s
+  s = substr(content, i+1, 73)
+  i = i + 73
   while (s)
   {
-    print " " s;
-    s = substr(content, i+1, 73);
-    i = i + 73;
+    print " " s
+    s = substr(content, i+1, 73)
+    i = i + 73
   }
 }
 
@@ -45,25 +57,22 @@ ENDFILE {
       cmd | getline res
       due = res ? res : ""
     }
-    escape(summary);
-    escape(desc);
-    escape_categories(categories);
   }
 }
 
-NR == FNR && desc { desc = desc "\\n" $0; next; }
+NR == FNR && desc { desc = desc "\\n" escape($0); next; }
 NR == FNR {
   if (substr($0, 1, 6) == "::: <|")
   {
     due = substr($0, 8);
     getline;
   }
-  summary = substr($0, 1, 2) != "# " ? "" : substr($0, 3);
+  summary = substr($0, 1, 2) != "# " ? "" : escape(substr($0, 3));
   getline;
-  categories = substr($0, 1, 1) != ">" ? "" : substr($0, 3);
+  categories = substr($0, 1, 1) != ">" ? "" : escape_categories(substr($0, 3));
   getline; # This line should be empty
   getline; # First line of description
-  desc = $0;
+  desc = escape($0);
   next;
 }
 
@@ -77,9 +86,9 @@ NR == FNR {
   print "SEQUENCE:" seq;
   print "LAST-MODIFIED:" zulu;
   if (due) print "DUE;VALUE=DATE:" due;
-  print_fold("SUMMARY:",     summary,       i, s);
-  print_fold("CATEGORIES:",  categories,    i, s);
-  print_fold("DESCRIPTION:", desc,          i, s);
+  print_fold("SUMMARY:",     summary);
+  print_fold("CATEGORIES:",  categories);
+  print_fold("DESCRIPTION:", desc);
   type = "";
 }
 { print }

src/main.sh

@@ -110,34 +110,64 @@ __lines() {
 
 # Program starts here
 if [ "${1:-}" = "--help" ]; then
-  echo "Usage: $0 [OPTION]"
-  echo ""
-  echo "You may specify at most one option."
-  echo "  --help                 Show this help and exit"
-  echo "  --tasks                Show tasks only"
-  echo "  --no-tasks             Ignore tasks"
-  echo "  --notes                Show notes only"
-  echo "  --no-notes             Ignore notes"
-  echo "  --journal              Show journal only"
-  echo "  --no-journal           Ignore journal"
-  echo "  --completed            Show completed tasks only"
-  echo "  --no-completed         Ignore completed tasks"
-  echo "  --new                  Create new entry"
-  echo ""
-  echo "The following options are for internal use."
-  echo "  --reload                            Reload list"
-  echo "  --preview <selection>               Generate preview"
-  echo "  --delete <selection>                Delete selected entry"
-  echo "  --decrease-priority <selection>     Decrease priority of selected task"
-  echo "  --increase-priority <selection>     Increase priority of selected task"
-  echo "  --toggle-completed <selection>      Toggle completion flag of task"
+  shift
+  echo "Usage: $0 [--help | --new [FILTER..] | [FILTER..] ]
+  --help                 Show this help and exit
+  --new                  Create new entry and do not exit
+  --git-init             Activate git usage and exit
+  --git <cmd>            Run git command and exit
+
+[FILTER]
+  You may specify any of these filters. Filters can be negated using the
+  --no-... versions, e.g., --no-tasks. Multiple filters are applied in
+  conjuction. By default, the filter --no-completed is used. Note that
+  --no-completed is not the same as --open, and similarly, --no-open is not the
+  same as --completed.
+
+  --tasks                 Show tasks only
+  --notes                 Show notes only
+  --journal               Show jounral only
+  --completed             Show completed tasks only
+  --open                  Show open tasks only
+  --filter <query>        Specify custom query"
+  exit
+fi
+
+# Git
+if command -v "git" >/dev/null && [ -d "$ROOT/.git" ]; then
+  GIT="git -C $ROOT"
+fi
+if [ "${1:-}" = "--git-init" ]; then
+  shift
+  if [ -n "${GIT:-}" ]; then
+    err "Git already enabled"
+    return 1
+  fi
+  if ! command -v "git" >/dev/null; then
+    err "Git not installed"
+    return 1
+  fi
+  git -C "$ROOT" init
+  git -C "$ROOT" add -A
+  git -C "$ROOT" commit -m 'Initial commit: Start git tracking'
+  exit
+fi
+if [ "${1:-}" = "--git" ]; then
+  shift
+  if [ -z "${GIT:-}" ]; then
+    err "Git not supported, run \`$0 --git-init\` first"
+    return 1
+  fi
+  $GIT "$@"
   exit
 fi
 
 # Command line arguments to be self-contained
 # Generate preview of file from selection
 if [ "${1:-}" = "--preview" ]; then
-  name=$(echo "$2" | cut -d ' ' -f 3)
+  shift
+  name=$(echo "$1" | cut -d ' ' -f 3)
+  shift
   file="$ROOT/$name"
   awk -v field="DESCRIPTION" "$AWK_GET" "$file" |
     $CAT
@@ -145,7 +175,9 @@ if [ "${1:-}" = "--preview" ]; then
 fi
 # Delete file from selection
 if [ "${1:-}" = "--delete" ]; then
-  name=$(echo "$2" | cut -d ' ' -f 3)
+  shift
+  name=$(echo "$1" | cut -d ' ' -f 3)
+  shift
   file="$ROOT/$name"
   summary=$(awk -v field="SUMMARY" "$AWK_GET" "$file")
   while true; do
@@ -154,6 +186,10 @@ if [ "${1:-}" = "--delete" ]; then
     case $yn in
     "yes")
       rm -v "$file"
+      if [ -n "$GIT" ]; then
+        $GIT add "$file"
+        $GIT commit -q -m "File deleted" -- "$file"
+      fi
       break
       ;;
     "no")
@@ -167,6 +203,7 @@ if [ "${1:-}" = "--delete" ]; then
 fi
 # Generate new entry
 if [ "${1:-}" = "--new" ]; then
+  shift
   collection=$(echo "$COLLECTION_LABELS" | tr ';' '\n' | $FZF --delimiter='=' --with-nth=2 --accept-nth=1)
   file=""
   while [ -f "$file" ] || [ -z "$file" ]; do
@@ -191,65 +228,122 @@ if [ "${1:-}" = "--new" ]; then
     tmpfile="$tmpmd.ics"
     awk -v uid="$uuid" "$AWK_NEW" "$tmpmd" >"$tmpfile"
     mv "$tmpfile" "$file"
+    if [ -n "$GIT" ]; then
+      $GIT add "$file"
+      $GIT commit -q -m "File added" -- "$file"
+    fi
   fi
   rm "$tmpmd"
 fi
 # Toggle completed flag
 if [ "${1:-}" = "--toggle-completed" ]; then
-  name=$(echo "$2" | cut -d ' ' -f 3)
+  shift
+  name=$(echo "$1" | cut -d ' ' -f 3)
+  shift
   file="$ROOT/$name"
   tmpfile=$(mktemp)
   awk "$AWK_ALTERTODO" "$file" >"$tmpfile"
   mv "$tmpfile" "$file"
+  if [ -n "$GIT" ]; then
+    $GIT add "$file"
+    $GIT commit -q -m "Completed toggle" -- "$file"
+  fi
 fi
 # Increase priority
 if [ "${1:-}" = "--increase-priority" ]; then
-  name=$(echo "$2" | cut -d ' ' -f 3)
+  shift
+  name=$(echo "$1" | cut -d ' ' -f 3)
+  shift
   file="$ROOT/$name"
   tmpfile=$(mktemp)
   awk -v delta="1" "$AWK_ALTERTODO" "$file" >"$tmpfile"
   mv "$tmpfile" "$file"
+  if [ -n "$GIT" ]; then
+    $GIT add "$file"
+    $GIT commit -q -m "Priority increased" -- "$file"
+  fi
 fi
 # Decrease priority
 if [ "${1:-}" = "--decrease-priority" ]; then
-  name=$(echo "$2" | cut -d ' ' -f 3)
+  shift
+  name=$(echo "$1" | cut -d ' ' -f 3)
+  shift
   file="$ROOT/$name"
   tmpfile=$(mktemp)
   awk -v delta="-1" "$AWK_ALTERTODO" "$file" >"$tmpfile"
   mv "$tmpfile" "$file"
+  if [ -n "$GIT" ]; then
+    $GIT add "$file"
+    $GIT commit -q -m "Priority decreased" -- "$file"
+  fi
 fi
+# Reload view
 if [ "${1:-}" = "--reload" ]; then
+  shift
   __lines
   exit
 fi
 
-query="${FZF_QUERY:-}"
-if [ "${1:-}" = "--no-completed" ]; then
-  query="!✅"
-fi
-if [ "${1:-}" = "--completed" ]; then
-  query="✅"
-fi
-if [ "${1:-}" = "--tasks" ]; then
-  query="✅ | 🔲"
-fi
-if [ "${1:-}" = "--no-tasks" ]; then
-  query="!✅ !🔲"
-fi
-if [ "${1:-}" = "--notes" ]; then
-  query="🗒️"
-fi
-if [ "${1:-}" = "--no-notes" ]; then
-  query="!🗒️"
-fi
-if [ "${1:-}" = "--journal" ]; then
-  query="📘"
-fi
-if [ "${1:-}" = "--no-journal" ]; then
-  query="!📘"
-fi
-query=${query:-!✅}
-query=$(echo "$query" | xargs)
+while [ -n "${1:-}" ]; do
+  case "${1:-}" in
+  "--completed")
+    shift
+    cliquery="${cliquery:-} ✅"
+    ;;
+  "--no-completed")
+    shift
+    cliquery="${cliquery:-} !✅"
+    ;;
+  "--open")
+    shift
+    cliquery="${cliquery:-} 🔲"
+    ;;
+  "--no-open")
+    shift
+    cliquery="${cliquery:-} !🔲"
+    ;;
+  "--tasks")
+    shift
+    cliquery="${cliquery:-} ✅ | 🔲"
+    ;;
+  "--no-tasks")
+    shift
+    cliquery="${cliquery:-} !✅ !🔲"
+    ;;
+  "--notes")
+    shift
+    cliquery="${cliquery:-} 🗒️"
+    ;;
+  "--no-notes")
+    shift
+    cliquery="${cliquery:-} !🗒️"
+    ;;
+  "--journal")
+    shift
+    cliquery="${cliquery:-} 📘"
+    ;;
+  "--no-journal")
+    shift
+    cliquery="${cliquery:-} !📘"
+    ;;
+  "--filter")
+    shift
+    cliquery="${cliquery:-} $1"
+    shift
+    ;;
+  "--no-filter")
+    shift
+    cliquery="${cliquery:-} !$1"
+    shift
+    ;;
+  *)
+    err "Unknown option \"$1\""
+    exit 1
+    ;;
+  esac
+done
+query=${cliquery:-${FZF_QUERY:-!✅}}
+query=$(echo "$query" | sed "s/^ *//" | sed "s/ *$//")
 
 selection=$(
   __lines | $FZF --ansi \
@@ -296,6 +390,10 @@ if [ "$checksum" != "$(cksum "$filetmp")" ]; then
   file_new="$filetmp.ics"
   awk "$AWK_UPDATE" "$filetmp" "$file" >"$file_new"
   mv "$file_new" "$file"
+  if [ -n "$GIT" ]; then
+    $GIT add "$file"
+    $GIT commit -q -m "File modified" -- "$file"
+  fi
 fi
 rm "$filetmp"