X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/2e31cd732213c3d974089cad8e88ab2bb3ccf371..c4e8b6b5ce14a2bc02791eff2930174f4f14c97f:/.mutt/bgrun?ds=sidebyside

diff --git a/.mutt/bgrun b/.mutt/bgrun
index 260925c..6e16630 100755
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -29,15 +29,25 @@ notify() {
   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"
+TEMPFILE=$(tempfile -d . -p mutt -s $(guess_extension "$MIMETYPE"))
+
 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"
+    cat > "$TEMPFILE"
     (
-      run-mailcap --action=view "$MIMETYPE":"$TEMPFILE"
+    launch_viewer "$MIMETYPE" "$TEMPFILE"
       if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
         notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
           "Output from mutt/$SELF on $BASENAME"
@@ -46,14 +56,19 @@ case "$SELF" in
     ) &
     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.
-    mkfifo "$TEMPFILE"
-    INPUTFILE="$1"
-    cat "$INPUTFILE" > $TEMPFILE &
-    sensible-browser "$TEMPFILE" > $TMPDIR/output.stdout 2> $TMPDIR/output.stderr
+    cat > "$TEMPFILE"
+    FIFO="${TEMPFILE%/*}/fifo-${TEMPFILE##*/}"
+    mkfifo "$FIFO"
+    cat "$TEMPFILE" > "$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
     cleanup
     ;;