Merge branch 'master' into screen-git

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 44218042baf5e162a510fe83f968a77f232a12cd..8ba8e0274bb4ae2bbe0f206fdbfcb13672ec8e97 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -63,6 +63,10 @@ function quote () {
     echo \'${1//\'/\'\\\'\'}\'
 }
 
+function quote_regexp () {
+    echo "$1" | sed 's/[][\^.$|)(*+?}{]/\\&/g'
+}
+
 function is_callable () {
     type $1 >/dev/null 2>&1
 }
@@ -136,12 +140,19 @@ fi
 if [ -z "$msgid" ] ; then
     die "could not find $search_header header in standard input"
 fi
+msgid_quoted=$(quote_regexp "$msgid")
 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)
-        orig_msgfiles=$($MAIRIX -r "m:$msgid_clean")
+        # mairix can't quote special characters (~,/=^) in search words. As a
+        # workaround, split Message-ID in 31-character long AND-linked
+        # substrings.
+        msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]/=,/g' \
+            -e 's/.\{31\}/&=,/g' -e 's/^\(=,\)\+//g' -e 's/$/=/' \
+            -e 's/\(=,\|=\)\+$/=/g')
+        orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
         ;;
     mu)
         orig_msgfiles=$($MU find -f l "i:$msgid_clean" | grep -v "^\*\*")
@@ -151,7 +162,7 @@ case $MUTTJUMP_INDEXER in
         ;;
     nmzmail)
         nmzmail_results=$(mktemp -d)
-        echo "+message-id:$msgid" | $NMZMAIL -r "$nmzmail_results"
+        echo "+message-id:/^$msgid_quoted$/" | $NMZMAIL -r "$nmzmail_results"
         orig_msgfiles=$(find "$nmzmail_results" -type l -exec readlink {} \;)
         rm -rf "$nmzmail_results"
         ;;
@@ -170,7 +181,7 @@ fi
 count=$(echo "$orig_msgfiles" | wc -l)
 if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
     choices=$(echo "$orig_msgfiles" | while read line ;
-        do echo -e "$(dirname "$(dirname "$line")")\n." ; done)
+        do dirname "$(dirname "$line")" ; echo . ; done)
     maxwidth=$(echo "$choices" | wc -L)
     orig_maildir=$($DIALOG_PROG --clear --title "More than one mailbox found" \
         --menu "Select mailbox:" $((count+8)) $((maxwidth+16)) \
@@ -196,15 +207,15 @@ if [ ! -d "$orig_maildir/cur" ] ; then
     die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
 fi
 
-jump_expr="~i'$msgid'"
+msgid_mutt=$(quote_regexp "$msgid_quoted")
+jump_expr="~i'$msgid_mutt'"
+jump_cmd="<limit>$jump_expr<enter>"
+if [ "$MUTTJUMP_MODE" = search ] ; then
+    jump_cmd="$jump_cmd<limit>all<enter>"
+fi
 
 if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
-    jump_cmd="<limit>$jump_expr<enter>"
-    if [ "$MUTTJUMP_MODE" = search ] ; then
-        jump_cmd="$jump_cmd<limit>all<enter>"
-    fi
-
     if [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
         MUTTJUMP_USE_SCREEN=yes
     fi
@@ -228,12 +239,22 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
 else
 
-    jump_cmd="l$jump_expr\r"
+    jump_cmd_short="l$jump_expr\r"
     if [ "$MUTTJUMP_MODE" = search ] ; then
-        jump_cmd="${jump_cmd}lall\r"
+        jump_cmd_short="${jump_cmd_short}lall\r"
     fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
 
-    $SCREEN -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
+    if [ -z "$STY" ] ; then
+        reopen_tty
+        $SCREEN -t "$screen_window_name" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+    else
+        $SCREEN -X -p "$screen_window_name" -Q select "$screen_window_name" >/dev/null
+        if [ $? != 0 ] ; then
+            $SCREEN -X screen -t "$screen_window_name" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+        else
+            $SCREEN -X -p "$screen_window_name" stuff "$jump_cmd_short"
+        fi
+    fi
 fi