X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/95f0235d5cc8121a08d7f02f7a1c3a489697573d..35027f951249b93a925c900f8f4c577c78c838a8:/muttjump?ds=inline
diff --git a/muttjump b/muttjump
index 4ba392f..cf6650f 100755
--- a/muttjump
+++ b/muttjump
@@ -29,16 +29,12 @@ MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-auto}
# "yes" or "no"
-# If this is set to "yes", muttjump will not open a new instance of
-# mutt, but instead jump to the original message in a running mutt
-# (which is running in a screen session).
-# ATTENTION: You need to have one mutt instance open for every mailbox
-# for this to work!
+# Set this to "yes" if you want exactly one screen window (with mutt running
+# inside) per mailbox. With new versions of screen (> 4.00) it is possible
+# to do that automatically, with old versions you have to start them
+# manually! Setting this to yes implies MUTTJUMP_USE_SCREEN=yes.
MUTTJUMP_MULTI_SCREEN_MODE=${MUTTJUMP_MULTI_SCREEN_MODE:-no}
-# name of the screen session (screen -S ...), leave blank for none
-MUTTJUMP_SCREEN_SESSION=${MUTTJUMP_SCREEN_SESSION:-}
-
# function to create the screen window name from the full path of the mailbox
if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () {
@@ -46,6 +42,10 @@ if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
}
fi
+# Version of GNU screen
+# Since 4.01.00devel (commit 98b6b41) backslash handling for -X was altered.
+MUTTJUMP_SCREEN_VERSION=${MUTTJUMP_SCREEN_VERSION:-auto}
+
# program paths
MUTT=${MUTT:-mutt}
MAIRIX=${MAIRIX:-mairix}
@@ -66,10 +66,30 @@ 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 }'
+}
+
+# Check if screen is new enough to parse -X (commit 98b6b41) and support
+# -Q (commit 8147d08). It (falsely) assumes that screen version > 4.00
+# does this. Distributions that use git versions are likely to also keep
+# them up to date.
+function is_new_screen () {
+ sv=$MUTTJUMP_SCREEN_VERSION
+ if [ "$sv" = auto ] ; then
+ sv=$($SCREEN --version | awk '{print $3}')
+ fi
+ echo "$sv" | grep -vq "^\(4\.00\|[0-3]\.\)"
+}
+
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 "^\*\*")
@@ -145,7 +184,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"
;;
@@ -164,13 +203,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
+ 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 "${choices[@]}" ; do
+ orig_maildir=$md
+ break
+ done <> /dev/tty
else
- orig_msgfile=$(echo "$orig_msgfiles" | head -n1)
+ orig_msgfile=$orig_msgfiles
# get containing maildir of $orig_msgfile
orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
fi
@@ -179,55 +229,45 @@ if [ ! -d "$orig_maildir/cur" ] ; then
die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
fi
-jump_expr="~i'$msgid'"
-
-if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
-
- jump_cmd="$jump_expr"
- if [ "$MUTTJUMP_MODE" = search ] ; then
- jump_cmd="$jump_cmdall"
- fi
+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_USE_SCREEN" = auto -a -n "$STY" ] ; then
- MUTTJUMP_USE_SCREEN=yes
- fi
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = yes ] ||
+ [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
+ MUTTJUMP_USE_SCREEN=yes
+fi
- screen_opts=()
- if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
- [ -n "$STY" ] && screen_opts=("-X" "screen")
- screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
- screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
+screen_opts=()
+screen_query_arg=""
+if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
+ if [ -n "$STY" ] ; then
+ screen_opts=("-X" "screen")
+ if is_new_screen ; then
+ jump_cmd=${jump_cmd/\\/\\\\\\}
+ screen_query_arg="-Q"
+ fi
else
- SCREEN=""
- # Close message-stdin and open terminal-stdin instead.
- # mutt behaves different if STDIN is no terminal
- # TODO: Find cleaner solution (e.g. mutt command-line argument?)
- exec 0<&-
- term="/dev/$(ps -p$$ -otty=)"
- exec < $term
- fi
-
- # start mutt, open original folder and jump to the original message
- $SCREEN "${screen_opts[@]}" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
-
-else
-
- jump_cmd="l$jump_expr
"
- if [ "$MUTTJUMP_MODE" = search ] ; then
- jump_cmd="${jump_cmd}lall
"
+ reopen_tty
fi
-
screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
- screen_opts=()
- if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
- screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
- screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
- fi
-
- $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
+ screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
+else
+ SCREEN=""
+ reopen_tty
+fi
- if [ $? != 0 ] ; then
- die "You have to manually start a screen session with:
-$SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = yes -a -n "$STY" ] ; then
+ $SCREEN -X -p "$screen_window_name" $screen_query_arg \
+ select "$screen_window_name" >/dev/null
+ if [ $? = 0 ] ; then
+ $SCREEN -X -p "$screen_window_name" stuff ":push \"$jump_cmd\"
"
+ exit 0
fi
fi
+
+# start mutt, open original folder and jump to the original message
+$SCREEN "${screen_opts[@]}" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""