Added support for using notmuch as an external indexer.

- also updated documentation where I could find it to list notmuch as
  an option

This should only work with notmuch 0.5 and greater because it requires
the "--output=files" option which was added in notmuch 0.5.

diff --git a/README b/README
index a31d7347a17872c350730f13ece4535c547cb043..7e69efe7645c7873989f3d3cfe9673a349e43680 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 muttjump
 written by Johannes Weißl
 
 muttjump
 written by Johannes Weißl
 

-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.
 
 These search engines usually create a virtual maildir containing symbolic
 links to the original mails, which can be browsed using mutt.

diff --git a/muttjump b/muttjump
index 0c97d61a488c14fcbd6e710b7ac53a44ab268433..37dd0c2b016ab9f33a70a4a51d675685ae6bec49 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -3,8 +3,8 @@
 
 # muttjump
 #
 
 # 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.
 #
 # 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"
 
 #
 # 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)
 MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-}
 
 # "limit" or "search" (default)


@@ -51,6 +51,7 @@ MUTT=${MUTT:-mutt}
 MAIRIX=${MAIRIX:-mairix}
 MU=${MU:-mu}
 NMZMAIL=${NMZMAIL:-nmzmail}
 MAIRIX=${MAIRIX:-mairix}
 MU=${MU:-mu}
 NMZMAIL=${NMZMAIL:-nmzmail}

+NOTMUCH=${NOTMUCH:-notmuch}

 SCREEN=${SCREEN:-screen}
 FORMAIL=${FORMAIL:-formail}
 REFORMAIL=${REFORMAIL:-reformail}
 SCREEN=${SCREEN:-screen}
 FORMAIL=${FORMAIL:-formail}
 REFORMAIL=${REFORMAIL:-reformail}


@@ -191,6 +192,9 @@ case $MUTTJUMP_INDEXER in
         orig_msgfiles=$(find "$nmzmail_results" -type l -exec readlink {} \;)
         rm -rf "$nmzmail_results"
         ;;
         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"
         ;;
     "")
         die "variable MUTTJUMP_INDEXER not set or empty"
         ;;