X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/95f0235d5cc8121a08d7f02f7a1c3a489697573d..a03c48be160b3a403864f93ac8d4b64f683a728e:/muttjump
diff --git a/muttjump b/muttjump
index 4ba392f..2127243 100755
--- a/muttjump
+++ b/muttjump
@@ -36,9 +36,6 @@ MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-auto}
# for this to work!
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 () {
@@ -66,10 +63,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")
+ # 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/ *$/=/g' \
+ -e 's/ /=,/g')
+ orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
;;
mu)
orig_msgfiles=$($MU find -f l "i:$msgid_clean" | grep -v "^\*\*")
@@ -145,7 +166,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 +185,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,32 +211,31 @@ 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
screen_opts=()
if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
- [ -n "$STY" ] && screen_opts=("-X" "screen")
+ if [ -n "$STY" ] ; then
+ screen_opts=("-X" "screen")
+ else
+ reopen_tty
+ fi
screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
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
+ reopen_tty
fi
# start mutt, open original folder and jump to the original message
@@ -212,22 +243,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_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\""
- 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 [ -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