X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/8937bb7554dbcfad9face59b9d9b5c4368fcff6e..526e9dd4a44387a8cdf0431464657f44bfd2f72f:/.mutt/bgrun?ds=inline diff --git a/.mutt/bgrun b/.mutt/bgrun index d4278b2..890b50e 100755 --- a/.mutt/bgrun +++ b/.mutt/bgrun @@ -1,104 +1,180 @@ #!/bin/sh +#exec 2>> /tmp/bgrun.stderr +#set -x + SELF="${0##*/}" -if [ -z "$TMPDIR" ]; then - TMPDIR=/tmp -elif [ -d "${TMPDIR}/volatile" ]; then - TMPDIR="${TMPDIR}/volatile" -fi -export TMPDIR -TMPDIR=$(mktemp -dp "$TMPDIR" mutt.XXXXXXXXXX) -cleanup() { cd / && notify_output && rm -rf "$TMPDIR"; } +TEMPDIR= +TEMPRUNDIR=.tempdir-run.d +cleanup() { + if [ -d $TEMPRUNDIR ]; then + local TEMPDIR; TEMPDIR="$PWD" + notify_output + cd / + rm -rf "$TEMPDIR" + fi + trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15 +} trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15 -cd "$TMPDIR" +enter_tempdir() { + if [ -d $TEMPRUNDIR ]; then + return + + else + if [ -z "${TMPDIR:-}" ]; then + TMPDIR=/tmp + fi + for i in $LOGNAME volatile; do + if [ -d "${TMPDIR}/$i" ]; then + TMPDIR="${TMPDIR}/$i" + break + fi + done + cd $(mktemp -dp "$TMPDIR" mutt.XXXXXXXXXX) + mkdir $TEMPRUNDIR + fi +} notify() { if [ -x "$(command -v awesome-client)" ]; then + local stdout stderr escaped output + stdout="${2:-}" + stderr="${3:-}" + for i in stdout stderr; do + if eval test -s $TEMPRUNDIR/output.$i; then + escaped=$(eval sed -e 's,\",\\\",g' $TEMPRUNDIR/output.$i) + output="${output:+$output +}${i}: +$escaped" + fi + done + [ -n "${escaped:-}" ] || return awesome-client <<-_eof local naughty = require("naughty") naughty.notify({ preset = naughty.config.presets.low, - title = "$3", - text = [[stdout: - $(sed -e 's,\",\\\",g' "$1") - stderr: - $(sed -e 's,\",\\\",g' "$2")]] + title = "${1:-Output from mutt/$SELF}", + text = [[$output]] }) _eof fi } notify_output() { - if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then - notify $TMPDIR/output.stdout $TMPDIR/output.stderr \ - "Output from mutt/$SELF on $BASENAME" - fi + [ -d $TEMPRUNDIR ] || return + local stdout stderr anything + + for i in stdout stderr; do + if [ -s "$TEMPRUNDIR/output.$i" ]; then + eval $i="'$TEMPRUNDIR/output.$i'" + else + eval $i=/dev/null + fi + done + + notify "Output from mutt/$SELF" $stdout $stderr } 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")) + t=$(TMPDIR="$PWD" tempfile -s $(guess_extension "$MIMETYPE")) cat > "$t" echo "$t" else t="$(echo ${1##*/} | sed -re 's![^[:alnum:],.@%^+=_-]!_!gi')" - cp "$1" "$t" + ln "$1" "$t" 2>/dev/null || cp "$1" "$t" echo "$t" fi } +MIMETYPE= FILENAME= VIEWER= DELAY=1 +state= +for arg in "$@"; do + case "$state/$arg" in + + (/-t) state=t;; + (t/*) MIMETYPE="$arg"; state=;; + + (/-f) state=f;; + (f/*) FILENAME="$arg"; state=;; + + (/-d) state=d;; + (d/*) DELAY="$arg"; state=;; + + (/-v) state=v;; + (v/*) VIEWER="$arg"; state=;; + + (*) + echo >&2 "E: Invalid argument: $i" + exit 1 + ;; + + esac +done + +launch_viewer() { + local filename; filename="$1" + if [ -z "$VIEWER" ]; then + [ -n "${2:-}" ] && filename="${2}:${1}" + run-mailcap "$filename" > $TEMPRUNDIR/output.stdout 2> $TEMPRUNDIR/output.stderr + else + $VIEWER "$filename" > $TEMPRUNDIR/output.stdout 2> $TEMPRUNDIR/output.stderr + fi +} + case "$SELF" in - (bgrun) + (bgview) # 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. - FILE="$(get_file "${1:-}")" + enter_tempdir + FILE="$(get_file "$FILENAME")" ( - launch_viewer "$MIMETYPE" "$FILE" - sleep 1 + ts=$(($(date +%s) + $DELAY)) + launch_viewer "$FILE" "$MIMETYPE" + while [ $(date +%s) -lt $ts ]; do sleep 1; done cleanup ) & trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15 ;; - (bgrun-fifo) + (bgview-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. - FILE="$(get_file "${1:-}")" - FIFO="${FILE%/*}/fifo-${FILE##*/}" + enter_tempdir + FILE="$(get_file "$FILENAME")" + FIFO="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}" + launch_viewer "$FIFO" "$MIMETYPE" wait cleanup ;; - (bgrun-delay) - # hack to stay around for a fixed period of time after the viewer process - # returns control to the caller, so that we can clean up. This is for - # cases when the FIFO method doesn't work, because e.g. Firefox randomly - # chooses it needs to read HTML files twice. - FILE="$(get_file "${1:-}")" - (launch_viewer "$MIMETYPE" "${FILE}") & + (bgview-delay) + # hack to stay around until the file hasn't been accessed for a few + # seconds, so that we can clean up. This is for cases when the FIFO method + # doesn't work, because e.g. Firefox randomly chooses it needs to read + # HTML files twice. + enter_tempdir + FILE="$(get_file "$FILENAME")" + touch "$FILE" + (launch_viewer "$FILE" "$MIMETYPE") & ( - sleep 1m - echo Cleaning up $TMPDIR… > $TMPDIR/output.stderr + while [ $(($(stat -c%X "$FILE") + $DELAY)) -gt $(date +%s) ]; do + sleep 1 + done cleanup ) & + trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15 ;; esac