improved handling of attachments with spaces in filenames

[etc/mutt.git] / .mutt / bgrun

diff --git a/.mutt/bgrun b/.mutt/bgrun
index e0bcd20dc8682cf77389e7cac92fab008214a040..4dcd3e21cf8280a3719f8315d8657220dc1ef4c8 100755 (executable)
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -9,10 +9,10 @@ elif [ -d "${TMPDIR}/volatile" ]; then
 fi
 export TMPDIR
 TMPDIR=$(mktemp -dp "$TMPDIR" mutt.XXXXXXXXXX)
 fi
 export TMPDIR
 TMPDIR=$(mktemp -dp "$TMPDIR" mutt.XXXXXXXXXX)

-trap "rm -rf '$TMPDIR'" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+cleanup() { cd / && rm -rf "$TMPDIR"; }
+trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15

 
 

-BASENAME="${1##*/}"
-TEMPFILE="${TMPDIR}/${BASENAME}"
+cd "$TMPDIR"

 
 notify() {
   if [ -x "$(command -v awesome-client)" ]; then
 
 notify() {
   if [ -x "$(command -v awesome-client)" ]; then


@@ -29,32 +29,60 @@ notify() {
   fi
 }
 
   fi
 }
 

+guess_extension() {
+  python -c "import mimetypes; print(mimetypes.guess_extension('$1'))"
+}
+
+launch_viewer() {
+  run-mailcap --action=view "$1":"$2" > output.stdout 2> output.stderr
+}
+
+MIMETYPE="$1"; shift
+
+get_file() {
+  local t
+  if [ -z "$1" ]; then
+    t=$(tempfile -d . -p mutt -s $(guess_extension "$MIMETYPE"))
+    cat > "$t"
+    echo "$t"
+  else
+    t="$(echo ${1##*/} | sed -re 's![^[:alnum:],.:@%^+=_-]!_!gi')"
+    cp "$1" "$t"
+    echo "$t"
+  fi
+}
+

 case "$SELF" in
   (bgrun)
     # make a copy of the file, then launch a shell process in the background
     # to divert to run-mailcap, after which the temporary directory gets
     # cleaned up.
 case "$SELF" in
   (bgrun)
     # make a copy of the file, then launch a shell process in the background
     # to divert to run-mailcap, after which the temporary directory gets
     # cleaned up.

-    cp -a "$1" $TMPDIR
-    MIMETYPE="$2"
+    FILE="$(get_file "${1:-}")"

     (
     (

-      run-mailcap --action=view "$MIMETYPE":"$TEMPFILE"
-      rm -rf "$TMPDIR"
+      launch_viewer "$MIMETYPE" "$FILE"

       if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
         notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
           "Output from mutt/$SELF on $BASENAME"
       fi
       if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
         notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
           "Output from mutt/$SELF on $BASENAME"
       fi

+      sleep 1
+      cleanup

     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
     ;;
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
     ;;

-  (browserrun)
-    # hack to stay around until the browser has read the file: make a fifo and
+  (bgrun-fifo)
+    # hack to stay around until the viewer has read the file: make a fifo and

     # wait for the cat process to finish writing to it, which means that it
     # must have been consumed on the other end.
     # wait for the cat process to finish writing to it, which means that it
     # must have been consumed on the other end.

-    mkfifo "$TEMPFILE"
-    INPUTFILE="$1"
-    cat "$INPUTFILE" > $TEMPFILE &
-    sensible-browser "$TEMPFILE" > $TMPDIR/output.stdout 2> $TMPDIR/output.stderr
+    FILE="$(get_file "${1:-}")"
+    FIFO="${FILE%/*}/fifo-${FILE##*/}"
+    mkfifo "$FIFO"
+    cat "$FILE" > "$FIFO" &
+    # For some reason, we do have to write a tempfile and cannot seem to
+    # redirect stdin directly to the fifo, i.e. this does not work instead of
+    # the previous three lines:
+    ## cat > "$FIFO" &
+    launch_viewer "$MIMETYPE" "${FIFO}"

     wait
     wait

+    cleanup

     ;;
 esac
     ;;
 esac

-