tags keys and other improvements

src/main.sh

@@ -29,6 +29,15 @@ set -eu
 # preview functions
 . "sh/preview.sh"
 
+# varia functions
+. "sh/varia.sh"
+
+# tags
+. "sh/tags.sh"
+
+# keys
+. "sh/keys.sh"
+
 if [ "${1:-}" = "--list-threads" ]; then
   shift
   nmquery="$1"
@@ -74,7 +83,7 @@ fi
 if [ "${1:-}" = "--view-source" ]; then
   shift
   messageid="$1"
-  less $($NOTMUCH search --output=files id:$messageid)
+  $NOTMUCH show --part=0 id:"$messageid" | $CATEMAIL | less
   exit
 fi
 
@@ -85,7 +94,7 @@ if [ "${1:-}" = "--show-message-parts" ]; then
   exit
 fi
 
-# FZF default configs
+# FZF defaults
 FZF_DEFAULT_PREVIEW_WINDOW="right,80,border-line,wrap-word"
 FZF_ALTERNATE_PREVIEW_WINDOW="bottom,80%,border-line,wrap-word"
 FZF_DEFAULT_THREAD_LINE="{1}  {3} ({4})"
@@ -101,32 +110,18 @@ if [ "${1:-}" = "--open-part" ]; then
     --with-nth=2 \
     --accept-nth=1 \
     --margin='30%' \
-    --bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
+    --bind='change:best' \
-    --bind='page-up:preview-half-page-up,page-down:preview-half-page-down' \
+    --bind="$KEYS_DOWN_HP:half-page-down" \
-    --bind="ctrl-h,backward-eof:abort" || true)
+    --bind="$KEYS_UP_HP:half-page-up" \
+    --bind="$KEYS_ENTER:accept" \
+    --bind="$KEYS_BACK,$KEYS_CANCEL,backward-eof:abort" || true)
   [ "$res" ] || exit
   tmpfile=$(mktemp)
   nm_message_get_part "$messageid" "$res" > "$tmpfile"
-  file "$tmpfile"
+  if ynprompt "Are you sure you want to open this file?" "$(ls -lh "$tmpfile")\n$(file -b "$tmpfile")"; then
-  while true; do
+    # TODO: should we clean up at some point?
-    printf "Are you sure you want to open \"%s\"? (yes/no): " "$tmpfile" >/dev/tty
-    read -r yn
-    case $yn in
-    "yes")
     open "$tmpfile" >/dev/null 2>/dev/stdout
-      printf "Press <enter> to continue." >/dev/tty
+  fi
-      read -r tmp
-      break
-      ;;
-    "no")
-      break
-      ;;
-    *)
-      echo "Please answer \"yes\" or \"no\"." >/dev/tty
-      ;;
-    esac
-  done
-  rm -f "$tmpfile"
   exit
 fi
 
@@ -135,9 +130,9 @@ if [ "${1:-}" = "--archive" ]; then
   [ "$1" = "thread" ] && thread=1
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo "$@" | sed "s/\s\(\S\)/ $field:\1/g" | sed "s/^/$field:/")"
+  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
-  nm_tag "-inbox" "$query"
+  tagmod="$(echo " $TAG_INBOX $TAGS_NEW" | sed "s/\s\(\S\)/ -\1/g")"
-  nm_tag "-unread" "$query"
+  $NOTMUCH tag $tagmod "$query"
   exit
 fi
 
@@ -146,9 +141,27 @@ if [ "${1:-}" = "--delete" ]; then
   [ "$1" = "thread" ] && thread=1
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo "$@" | sed "s/\s\(\S\)/ $field:\1/g" | sed "s/^/$field:/")"
+  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
-  nm_tag "-inbox" "$query"
+  $NOTMUCH tag -$TAG_INBOX +$TAG_DEL "$query"
-  nm_tag "+del" "$query"
+  exit
+fi
+
+if [ "${1:-}" = "--undelete" ]; then
+  shift
+  query="$(echo " $@" | sed "s/\s\(\S\)/ thread:\1/g")"
+  $NOTMUCH tag -$TAG_DEL "$query"
+  exit
+fi
+
+if [ "${1:-}" = "--purge" ]; then
+  shift
+  # query="$(echo " $@" | sed "s/\s\(\S*\)/ (thread:\1 and tag:del)/g" | sed 's/)\(\s\+\)(/) or (/g')"
+  query="tag:$TAG_DEL and ("$(echo " $@" | sed "s/\s\(\S\)/ thread:\1/g")")"
+  files=$(nm_files_all "$query")
+  if ynprompt "Are you sure you want to purge these files?" "$files"; then
+    echo -n "$files" | xargs -d "\n" rm
+    nm_new
+  fi
   exit
 fi
 
@@ -159,7 +172,7 @@ if [ "${1:-}" = "--tag-modify" ]; then
   [ "$1" = "add" ] && sign=+ || sign=-
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo "$@" | sed "s/\s\(\S\)/ $field:\1/g" | sed "s/^/$field:/")"
+  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
   if [ "$sign" = "+" ]; then
     tagquery=""
     label_text="Add tag"
@@ -171,13 +184,16 @@ if [ "${1:-}" = "--tag-modify" ]; then
     --color="border:$ANSICOLORTAGS" \
     --color="label:$ANSICOLORTAGS" \
     --tac \
-    --bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
+    --bind="$KEYS_DOWN_HP:half-page-down" \
+    --bind="$KEYS_UP_HP:half-page-up" \
+    --bind="$KEYS_BACK,$KEYS_CANCEL,backward-eof:abort" \
+    --bind="$KEYS_ENTER:accept-or-print-query" \
+    --bind="$KEYS_ENTER_ALTERNATIVE:transform:echo \"print(\$FZF_QUERY)+accept\"" \
     --margin='20%' \
-    --bind='enter:accept-or-print-query' \
     --border=double \
-    --border-label="  $label_text  " || true)
+    --border-label="  $label_text  " | head -1 || true)
   [ "$res" ] || exit
-  nm_tag "$sign$res" "$query"
+  $NOTMUCH tag $sign$res "$query"
   exit
 fi
 
@@ -191,28 +207,58 @@ if [ "${1:-}" = "--show-thread" ]; then
     --multi \
     --delimiter="$(printf '\t')" \
     --with-nth="$FZF_DEFAULT_THREAD_LINE" \
-    --bind="ctrl-r:reload:$0 --list-messages-in-thread \"$thread\"" \
-    --bind="alt-s:change-with-nth({1}  {2} {3} ({4})|$FZF_DEFAULT_THREAD_LINE)" \
     --accept-nth=5 \
-    --bind='alt-j:preview-down,alt-k:preview-up' \
+    --bind="$KEYS_CANCEL:transform:[ \$FZF_SELECT_COUNT -gt 0 ] && echo clear-multi || echo abort" \
-    --bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
+    --bind="$KEYS_PREVIEW_DOWN:preview-down" \
-    --bind='page-up:preview-half-page-up,page-down:preview-half-page-down' \
+    --bind="$KEYS_PREVIEW_UP:preview-up" \
-    --bind="enter:" \
+    --bind="$KEYS_PREVIEW_DOWN_HP:preview-half-page-down" \
-    --bind="ctrl-h,backward-eof:abort" \
+    --bind="$KEYS_PREVIEW_UP_HP:preview-half-page-up" \
-    --bind="alt-/:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
+    --bind="$KEYS_CYCLE_DISPLAY:change-with-nth({1}  {2} {3} ({4})|$FZF_DEFAULT_THREAD_LINE)" \
-    --bind="alt-v:execute:$0 --view-source {5}" \
+    --bind="$KEYS_DOWN_HP:half-page-down" \
-    --bind="alt-h:change-preview:$0 --preview-html-message {5}" \
+    --bind="$KEYS_UP_HP:half-page-up" \
-    --bind="alt-+:execute($0 --tag-modify message add {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_ENTER:" \
-    --bind="alt--:execute($0 --tag-modify message del {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_BACK,$KEYS_CANCEL,backward-eof:abort" \
-    --bind="alt-enter:execute($0 --archive message {+4})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_PREVIEW_TOGGLE_SIZE:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
-    --bind="alt-delete:execute($0 --delete message {+4})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_VIEW_SOURCE:execute:$0 --view-source {5}" \
+    --bind="$KEYS_HTML_PREVIEW:change-preview:$0 --preview-html-message {5}" \
+    --bind="$KEYS_TAG_ADD:execute($0 --tag-modify message add {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_TAG_REMOVE:execute($0 --tag-modify message del {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_ARCHIVE:execute($0 --archive message {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_DELETE:execute($0 --delete message {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
+    --bind="$KEYS_OPEN:execute:$0 --open-part {5}" \
+    --bind="$KEYS_FLAG_TOGGLE:execute:echo NOT IMPLEMENTED;read -r t" \
+    --bind="$KEYS_REPLY:execute:echo NOT IMPLEMENTED;read -r t" \
+    --bind="$KEYS_COMPOSE:execute:echo NOT IMPLEMENTED;read -r t" \
     --bind="focus:change-preview($0 --preview-message {5})+transform-footer:printf '\033[4mMesssage parts\033[0m\n';$0 --show-message-parts {5}" \
-    --bind="ctrl-o:execute:$0 --open-part {5}" \
     --preview="$0 --preview-message {5}" \
     --preview-window="$FZF_DEFAULT_PREVIEW_WINDOW" || true)
   exit
 fi
 
+if [ "${1:-}" = "--list-deleted" ]; then
+  shift
+  list_threads "tag:$TAG_DEL" | $FZF \
+    --header-first \
+    --margin='5%' \
+    --header='DELETED MESSAGES' \
+    --footer="$KEYS_PURGE_ALL: purge ALL threads / $KEYS_DELETE: purge selected threads / $KEYS_ENTER_ALTERNATIVE: undelete selected threads" \
+    --border='double' \
+    --color="header:red:bold:underline,border:red,selected-bg:88" \
+    --tiebreak=index \
+    --reverse \
+    --multi \
+    --delimiter="$(printf '\t')" \
+    --with-nth='{1}  {2} ({3})' \
+    --bind="$KEYS_CANCEL:transform:[ \$FZF_SELECT_COUNT -gt 0 ] && echo clear-multi || echo abort" \
+    --bind="$KEYS_DOWN_HP:half-page-down" \
+    --bind="$KEYS_UP_HP:half-page-up" \
+    --bind="$KEYS_ENTER:" \
+    --bind="$KEYS_PURGE_ALL:select-all+execute($0 --purge {+4})+reload:$0 --list-threads \"tag:$TAG_DEL\"" \
+    --bind="$KEYS_DELETE:execute($0 --purge {+4})+reload:$0 --list-threads \"tag:$TAG_DEL\"" \
+    --bind="$KEYS_ENTER_ALTERNATIVE:execute($0 --undelete {+4})+reload:$0 --list-threads \"tag:$TAG_DEL\""
+  exit
+fi
+
 # Modes
 APPEND="append"
 NWSRCH="search"
@@ -221,9 +267,10 @@ ADDRESS_TO="to-"
 ADDRESS_FROM="from-"
 CMD_SEARCH_ADDRESS="address-"
 CMD_EDIT_QUERY="edit-query"
+CMD_GOTO_INBOX="go-to-inbox"
 
 while true; do
-  nmquery="${nmquery:-tag:inbox}"
+  nmquery="${nmquery:-tag:$TAG_INBOX}"
   [ "$(tail -1 "$NMFHIST")" = "$nmquery" ] || echo "$nmquery" >> "$NMFHIST"
   cmd=$(list_threads "$nmquery" | $FZF \
     --header-first \
@@ -233,24 +280,29 @@ while true; do
     --multi \
     --delimiter="$(printf '\t')" \
     --with-nth="{1}  {2} ({3})" \
-    --bind="ctrl-r:reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_SEARCH_TAG_REPLCE:print($CMD_SEARCH_TAG$NWSRCH)+accept" \
-    --bind="alt-t:print($CMD_SEARCH_TAG$NWSRCH)+accept" \
+    --bind="$KEYS_SEARCH_TAG_APPEND:print($CMD_SEARCH_TAG$APPEND)+accept" \
-    --bind="alt-T:print($CMD_SEARCH_TAG$APPEND)+accept" \
+    --bind="$KEYS_SEARCH_FROM_REPLCE:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$NWSRCH)+accept" \
-    --bind="alt-s:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$NWSRCH)+accept" \
+    --bind="$KEYS_SEARCH_FROM_APPEND:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$APPEND)+accept" \
-    --bind="alt-S:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$APPEND)+accept" \
+    --bind="$KEYS_SEARCH_TO_REPLCE:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$NWSRCH)+accept" \
-    --bind="alt-r:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$NWSRCH)+accept" \
+    --bind="$KEYS_SEARCH_TO_APPEND:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$APPEND)+accept" \
-    --bind="alt-R:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$APPEND)+accept" \
+    --bind="$KEYS_SEARCH_EDIT_QUERY:print($CMD_EDIT_QUERY)+accept" \
-    --bind="alt-q:print($CMD_EDIT_QUERY)+accept" \
+    --bind="$KEYS_PREVIEW_DOWN:preview-down" \
-    --bind='alt-j:preview-down,alt-k:preview-up' \
+    --bind="$KEYS_PREVIEW_UP:preview-up" \
-    --bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
+    --bind="$KEYS_PREVIEW_DOWN_HP:preview-half-page-down" \
-    --bind='page-up:preview-half-page-up,page-down:preview-half-page-down' \
+    --bind="$KEYS_PREVIEW_UP_HP:preview-half-page-up" \
-    --bind="enter,ctrl-l:execute($0 --show-thread {4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_CANCEL:clear-multi" \
-    --bind="alt-/:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
+    --bind="$KEYS_ENTER:execute($0 --show-thread {4})+reload:$0 --list-threads \"$nmquery\"" \
-    --bind="alt-h:change-preview:$0 --preview-html-thread {4}" \
+    --bind="$KEYS_DOWN_HP:half-page-down" \
-    --bind="alt-+:execute($0 --tag-modify thread add {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_UP_HP:half-page-up" \
-    --bind="alt--:execute($0 --tag-modify thread del {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_PREVIEW_TOGGLE_SIZE:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
-    --bind="alt-enter:execute($0 --archive thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_HTML_PREVIEW:change-preview:$0 --preview-html-thread {4}" \
-    --bind="alt-delete:execute($0 --delete thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_TAG_ADD:execute($0 --tag-modify thread add {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_TAG_REMOVE:execute($0 --tag-modify thread del {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_ARCHIVE:execute($0 --archive thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_DELETE:execute($0 --delete thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
+    --bind="$KEYS_SEARCH_DELETED:execute:$0 --list-deleted" \
+    --bind="$KEYS_SEARCH_INBOX:print($CMD_GOTO_INBOX)+accept" \
     --bind="focus:change-preview:$0 --preview-thread {4}" \
     --preview="$0 --preview-thread {4}" \
     --preview-window="$FZF_DEFAULT_PREVIEW_WINDOW" | head -1 || true)
@@ -261,11 +313,13 @@ while true; do
 	--color="border:$ANSICOLORTAGS" \
 	--color="label:$ANSICOLORTAGS" \
 	--tac \
-	--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
 	--margin='20%' \
-	--bind='enter:accept-or-print-query' \
+	--bind="$KEYS_DOWN_HP:half-page-down" \
+	--bind="$KEYS_UP_HP:half-page-up" \
+	--bind="$KEYS_ENTER:accept-or-print-query" \
+	--bind="$KEYS_ENTER_ALTERNATIVE:transform:echo \"print(\$FZF_QUERY)+accept\"" \
 	--border=double \
-	--border-label="  Select tag  " || true)
+	--border-label="  Select tag  " | head -1 || true)
       [ -n "$tag" ] || continue
       [ "$cmd" = "$CMD_SEARCH_TAG$APPEND" ] && nmquery="$nmquery and tag:$tag" || nmquery="tag:$tag"
       ;;
@@ -284,11 +338,13 @@ while true; do
 	--color="border:$ANSICOLORFROM" \
 	--color="label:$ANSICOLORFROM" \
 	--tiebreak=index \
-	--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
 	--margin='20%' \
-	--bind='enter:accept-or-print-query' \
+	--bind="$KEYS_DOWN_HP:half-page-down" \
+	--bind="$KEYS_UP_HP:half-page-up" \
+	--bind="$KEYS_ENTER:accept-or-print-query" \
+	--bind="$KEYS_ENTER_ALTERNATIVE:transform:echo \"print(\$FZF_QUERY)+accept\"" \
 	--border=double \
-	--border-label="$label_text" || true)
+	--border-label="$label_text" | head -1 || true)
       [ -n "$address" ] || continue
       case "$cmd" in
 	*$APPEND)
@@ -304,16 +360,21 @@ while true; do
 	--color="border:$ANSICOLORSUBJ" \
 	--color="label:$ANSICOLORSUBJ" \
 	--tac \
-	--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
 	--margin='20%' \
 	--query="$nmquery" \
 	--disabled \
 	--print-query \
 	--prompt="Query: " \
 	--bind='focus:replace-query' \
+	--bind="$KEYS_DOWN_HP:half-page-down" \
+	--bind="$KEYS_UP_HP:half-page-up" \
+	--bind="$KEYS_ENTER:accept" \
 	--border=double \
 	--border-label='  Query history  ' | head -1 || true)
       ;;
+    $CMD_GOTO_INBOX)
+      nmquery="tag:$TAG_INBOX"
+      ;;
     *)
       ;;
   esac

src/sh/keys.sh

@@ -0,0 +1,43 @@
+# This file defines the keys used in the keybindings
+# The keys are comma separated. See `fzf --man` for the possible keys.
+
+# List
+KEYS_DOWN_HP="ctrl-d"
+KEYS_UP_HP="ctrl-u"
+KEYS_BACK="ctrl-h"
+KEYS_ENTER="enter,ctrl-l"
+KEYS_CANCEL="esc"
+KEYS_ENTER_ALTERNATIVE="alt-enter"
+KEYS_CYCLE_DISPLAY="ctrl-space"
+
+KEYS_VIEW_SOURCE="alt-v"
+KEYS_HTML_PREVIEW="alt-h"
+KEYS_TAG_ADD="alt-+"
+KEYS_TAG_REMOVE="alt--"
+KEYS_ARCHIVE="ctrl-a"
+KEYS_DELETE="ctrl-delete"
+KEYS_FLAG_TOGGLE="ctrl-x"
+KEYS_OPEN="ctrl-o"
+KEYS_REPLY="ctrl-r"
+KEYS_COMPOSE="ctrl-n"
+
+# Preview window
+KEYS_PREVIEW_DOWN="alt-j"
+KEYS_PREVIEW_UP="alt-k"
+KEYS_PREVIEW_DOWN_HP="page-up"
+KEYS_PREVIEW_UP_HP="page-down"
+KEYS_PREVIEW_TOGGLE_SIZE="alt-/"
+
+# Keys specific to purge window
+KEYS_PURGE_ALL="ctrl-alt-d"
+
+# Change main views
+KEYS_SEARCH_TAG_REPLCE="alt-t"
+KEYS_SEARCH_TAG_APPEND="alt-T"
+KEYS_SEARCH_FROM_REPLCE="alt-s"
+KEYS_SEARCH_FROM_APPEND="alt-S"
+KEYS_SEARCH_TO_REPLCE="alt-r"
+KEYS_SEARCH_TO_APPEND="alt-R"
+KEYS_SEARCH_EDIT_QUERY="alt-q"
+KEYS_SEARCH_DELETED="alt-d"
+KEYS_SEARCH_INBOX="alt-1"

src/sh/lists.sh

@@ -20,7 +20,7 @@ list_threads() {
 # listed.
 # @argument $1: query (optional)
 list_tags() {
-  [ "${1:-}" ] && query="$1" || query="tag:/./"
+  [ "${1:-}" ] && query="$1" || query="*"
   $NOTMUCH search --output=tags "$query"
 }
 

src/sh/notmuch.sh

@@ -1,10 +1,16 @@
 # Wrapper around notmuch
 
+# notmuch new
+# This is used for updating the notmuch database
+nm_new() {
+  $NOTMUCH new
+}
+
 # Print the message id of the last message within a thread.
 # @argument $1: thread id
 nm_last_message_in_thread() {
   # TODO: We may be smarter here that just incorporating excluded messages
-  $NOTMUCH search --output=messages --offset=-1 --exclude=false thread:"$1" | sed 's/^...//'
+  $NOTMUCH search --output=messages --offset=-1 thread:"$1" | sed 's/^...//'
 }
 
 # Print the header of a message (with trailing empty line)
@@ -39,3 +45,9 @@ nm_message_get_part() {
 nm_tag() {
   $NOTMUCH tag "$1" "$2"
 }
+
+# Get all files, also of excluded matches
+# @argument $1: query
+nm_files_all() {
+  $NOTMUCH search --output=files --exclude=false "$1"
+}

src/sh/preview.sh

@@ -11,15 +11,10 @@
 # @argument #3: if set, then the HTML messages will be taken
 preview_message() {
   [ "$1" = "id" ] && messageid="$2" || messageid="$(nm_last_message_in_thread "$2")"
-  echo "preview_message: messageid=$messageid" >> /tmp/foo
   parts="$(nm_message_parts "$messageid")"
-  echo "preview_message: parts=$parts" >> /tmp/foo
   html="${3:-}"
-  echo "preview_message: html=$html" >> /tmp/foo
   nr="$(nm_message_part_nr "$messageid" "$html")"
-  echo "preview_message: nr=$nr" >> /tmp/foo
   [ ! "$nr" ] && [ ! "$html" ] && html="html" && nr="$(nm_message_part_nr "$messageid" "html")"
-  echo "preview_message: nr=$nr" >> /tmp/foo
   [ "$html" ] && parser="$PANDOC" || parser="cat"
   nm_message_header "$messageid" | $CATEMAIL
   [ "$nr" ] && (nm_message_get_part "$messageid" "$nr" | $parser | $CATMD)

src/sh/tags.sh

@@ -0,0 +1,13 @@
+# Default tags
+
+# The deleted tag is by default the first tag defined in the exclude settings.
+# If that does not exist, then it is "deleted".
+TAG_DEL=${TAG_DEL:-$($NOTMUCH config get search.exclude_tags|head -1)}
+TAG_DEL=${TAG_DEL:-deleted}
+
+# Tag for messages in the inbox
+TAG_INBOX=${TAG_INBOX:-inbox}
+
+# White-space separates list of tags that are automatically added to new
+# emails. These tags will be removed when the message/tread is archived.
+TAGS_NEW=${TAGS_NEW:-$($NOTMUCH config get new.tags | xargs echo)}

src/sh/varia.sh

@@ -0,0 +1,24 @@
+# Various functions
+
+# This prompts the user for a "yes" or a "no"
+# @argument $1: Question
+# @argument $2: Content to show in preview window
+# @return: 0 if the user answered "yes" and 1 otherwise.
+#!/bin/sh
+ynprompt() {
+  return $(printf '0 \033[32myes\033[0m\n1 \033[31mno\033[0m\n' |
+    $FZF \
+    --sync \
+    --bind='start:pos(2)' \
+    --bind='ctrl-c,ctrl-g,ctrl-q,esc:pos(2)+accept' \
+    --reverse \
+    --no-input \
+    --header="$1" \
+    --preview-window='60%,border-line' \
+    --margin='5%,5%,5%,15%' \
+    --preview="echo \"$2\"" \
+    --with-nth=2 \
+    --accept-nth=1 \
+    --header-border='line' \
+    --color='border:yellow,header:yellow')
+}