X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/461a262aea47dd6bcc6f590247857cabb5bf407c..ae578a31fcc268fba07c0f0df9a4ddd61ced4e73:/muttjump?ds=inline
diff --git a/muttjump b/muttjump
index 28fb3a7..2f60b3b 100755
--- a/muttjump
+++ b/muttjump
@@ -43,6 +43,10 @@ if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
}
fi
+# Version of GNU screen
+# Since 4.01.00 (commit d87a0d8) backslash handling was altered.
+MUTTJUMP_SCREEN_VERSION=${MUTTJUMP_SCREEN_VERSION:-auto}
+
# program paths
MUTT=${MUTT:-mutt}
MAIRIX=${MAIRIX:-mairix}
@@ -63,10 +67,18 @@ function quote () {
echo \'${1//\'/\'\\\'\'}\'
}
+function quote_regexp () {
+ echo "$1" | sed 's/[][\^.$|)(*+?}{]/\\&/g'
+}
+
function is_callable () {
type $1 >/dev/null 2>&1
}
+function wc_L () {
+ awk '{ y = length(); if (y > x) x = y } END { print x }'
+}
+
function usage () {
cat >&2 <$//')
# try to locate path of message using a mail search engine
case $MUTTJUMP_INDEXER in
mairix)
- orig_msgfiles=$($MAIRIX -r "m:$msgid_clean")
+ msgid_mairix=$msgid_clean
+ # mairix can't quote special characters (~,/=^) in search words. As a
+ # workaround, split Message-ID in 31-character long AND-linked
+ # substrings.
+ if echo "$msgid_clean" | grep -q '[~,/=^]' ; then
+ msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
+ -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ *$/=/g' \
+ -e 's/ /=,/g')
+ fi
+ orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
;;
mu)
orig_msgfiles=$($MU find -f l "i:$msgid_clean" | grep -v "^\*\*")
@@ -151,7 +173,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,25 +192,24 @@ 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)
- maxwidth=$(echo "$choices" | wc -L)
+ 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)) \
$count $choices 3>&2 2>&1 1>&3-)
elif [ $count -gt 1 ] ; then
- dirs=()
- for f in $orig_msgfiles ; do
- dirs=(${dirs[@]} "$(dirname "$(dirname "$f")")")
- done
+ choices=()
+ while read line ; do
+ choices=("${choices[@]}" "$(dirname "$(dirname "$line")")")
+ done <<<"$orig_msgfiles"
echo "More than one mailbox found"
echo "Select mailbox:"
- select md in ${dirs[@]} ; do
- orig_maildir="$md"
- orig_msgfile="${orig_msgfiles[$REPLY]}"
+ select md in "${choices[@]}" ; do
+ orig_maildir=$md
break
done <> /dev/tty
else
- orig_msgfile="$orig_msgfiles"
+ orig_msgfile=$orig_msgfiles
# get containing maildir of $orig_msgfile
orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
fi
@@ -197,15 +218,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="$jump_expr"
+if [ "$MUTTJUMP_MODE" = search ] ; then
+ jump_cmd="$jump_cmdall"
+fi
if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
- jump_cmd="$jump_expr"
- if [ "$MUTTJUMP_MODE" = search ] ; then
- jump_cmd="$jump_cmdall"
- fi
-
if [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
MUTTJUMP_USE_SCREEN=yes
fi
@@ -214,6 +235,13 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
if [ -n "$STY" ] ; then
screen_opts=("-X" "screen")
+ sv=$MUTTJUMP_SCREEN_VERSION
+ if [ "$sv" = auto ] ; then
+ sv=$($SCREEN --version | awk '{print $3}')
+ fi
+ if ! echo "$sv" | grep -q "^\(4\.00\|[0-3]\.\)" ; then
+ jump_cmd=${jump_cmd/\\/\\\\\\}
+ fi
else
reopen_tty
fi
@@ -229,12 +257,22 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
else
- jump_cmd="l$jump_expr
"
+ jump_cmd_short="l$jump_expr
"
if [ "$MUTTJUMP_MODE" = search ] ; then
- jump_cmd="${jump_cmd}lall
"
+ jump_cmd_short="${jump_cmd_short}lall
"
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