Added support for using notmuch as an external indexer.

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 17628da4570ffd8eeff966a05d155fbd0665ad0a..37dd0c2b016ab9f33a70a4a51d675685ae6bec49 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -3,8 +3,8 @@
 
 # muttjump
 #
-# This script makes mail indexers (like mairix, mu or nmzmail) together with
-# mutt more useful.
+# This script makes mail indexers (like mairix, mu, nmzmail, or
+# notmuch) together with mutt more useful.
 #
 # These search engines usually create a virtual maildir containing symbolic
 # links to the original mails, which can be browsed using mutt.
@@ -18,7 +18,7 @@
 #
 # macro generic ,j "<enter-command>push <pipe-message>muttjump<enter><enter>" "jump to original message"
 
-# one of: mairix, mairix-git, mu, mu-old (mu < 0.7) and nmzmail
+# one of: mairix, mairix-git, mu, mu-old (mu < 0.7), nmzmail or notmuch (>0.5)
 MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-}
 
 # "limit" or "search" (default)
@@ -51,6 +51,7 @@ MUTT=${MUTT:-mutt}
 MAIRIX=${MAIRIX:-mairix}
 MU=${MU:-mu}
 NMZMAIL=${NMZMAIL:-nmzmail}
+NOTMUCH=${NOTMUCH:-notmuch}
 SCREEN=${SCREEN:-screen}
 FORMAIL=${FORMAIL:-formail}
 REFORMAIL=${REFORMAIL:-reformail}
@@ -165,7 +166,6 @@ msgid_clean=$(echo "$msgid" | sed -e 's/^<//' -e 's/>$//')
 # try to locate path of message using a mail search engine
 case $MUTTJUMP_INDEXER in
     mairix-git)
-        msgid_mairix=$msgid_clean
         orig_msgfiles=$($MAIRIX -r "m:$msgid_clean")
         ;;
     mairix)
@@ -192,6 +192,9 @@ case $MUTTJUMP_INDEXER in
         orig_msgfiles=$(find "$nmzmail_results" -type l -exec readlink {} \;)
         rm -rf "$nmzmail_results"
         ;;
+    notmuch)
+       orig_msgfiles=$($NOTMUCH search --output=files "id:$msgid_clean")
+       ;;
     "")
         die "variable MUTTJUMP_INDEXER not set or empty"
         ;;