fixup last commit

[etc/taskwarrior.git] / .zsh / zshrc / parts.d / 50-taskwarrior

diff --git a/.zsh/zshrc/parts.d/50-taskwarrior b/.zsh/zshrc/parts.d/50-taskwarrior
index 2cf9d386d76bbf1be3d59c860aec6b107c72d31c..255a7701b9695bbb907ecf37c4b993c7c35bee36 100644 (file)
--- a/.zsh/zshrc/parts.d/50-taskwarrior
+++ b/.zsh/zshrc/parts.d/50-taskwarrior
@@ -1,7 +1,7 @@
 #
-# display ready taskwarrior tasks
+# taskwarrior shell integration
 #
-# Copyright © 1994–2017 martin f. krafft <madduck@madduck.net>
+# Copyright © 2018 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
 # Source repository: http://git.madduck.net/v/etc/zsh.git
@@ -9,21 +9,37 @@
 
 if whence task >/dev/null; then
 
-  alias t=task
-  alias ta='t add'
-  alias tn='t next'
-  alias tl='t all'
-  alias ty='t sync'
-  alias td='t done'
+  function task_() {
+    local spec cmd args nospec=0
+    cmd="$1"; shift
+    [[ "$cmd" = add ]] && nospec=1
+    for i in "$@"; do
+      case "$nospec@$i" in
+        (0@<->) :;&
+        (0@/*/) spec="${spec:+$spec }$i";;
+        (*) args="${args:+$args }$i";;
+      esac
+    done
+    eval task $spec $cmd $args
+  }
 
-  local SENTINEL=${XDG_RUNTIME_DIR}/taskwarrior/shell_run_sentinel
-  mkdir --parent ${SENTINEL%/*}
-  # only print the tasks at most once every 30 seconds
-  if [[ -t 0 ]] && [[ -z ${SENTINEL}(#qNms-30) ]]; then
-    touch ${SENTINEL}
-    task 2>/dev/null || :
-  fi
-  unset SENTINEL
+  alias t\?='alias -rm t t[-+a-z] | sed s,_,,'
+  alias ta='task_ add'
+  alias tc='task_ call'
+  alias th='task_ attach'
+  alias tl='task_ all'
+  alias ty='task_ next rc.recurrence=on >/dev/null && task_ sync'
+  alias td='task_ done'
+  alias te='task_ edit'
+  alias tu='task_ undo'
+  alias tm='task_ modify'
+  alias ts='task_ start'
+  alias tw='task_ waiting'
+  alias t+='task_ annotate'
+  alias t='task_ ""'
+
+  run_at_most_every 5m \
+    t 2>/dev/null || :
 fi
 
 # vim:ft=zsh