adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring bgnotify plugin up to date with t413/zsh-background-notify

Browse Source 
Changes include:
- time format now shows h/m/s (only when needed!)
- adds hooks only for interactive connections
- adds specific kde support (via kdialog)
- adds click-action for OS X terminals
This commit is contained in:
Tim O'Brien 2015-08-19 22:33:41 -07:00
parent 192de6bcff
commit 7c31c7a963
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/bgnotify/bgnotify.plugin.zsh
View File

@ -11,31 +11,38 @@ autoload -Uz add-zsh-hook || { print "can't add zsh hook!"; return }
## definitions ## ## definitions ##
if ! (type bgnotify_formatted | grep -q 'function'); then if ! (type bgnotify_formatted | grep -q 'function'); then ## allow custom function override
function bgnotify_formatted { function bgnotify_formatted { ## args: (exit_status, command, elapsed_seconds)
## exit_status, command, elapsed_time elapsed="$(( $3 % 60 ))s"
[ $1 -eq 0 ] && title="#win (took $3 s)" || title="#fail (took $3 s)" (( $3 >= 60 )) && elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
bgnotify "$title" "$2" (( $3 >= 3600 )) && elapsed="$(( $3 / 3600 ))h $elapsed"
[ $1 -eq 0 ] && bgnotify "#win (took $elapsed)" "$2" || bgnotify "#fail (took $elapsed)" "$2"
} }
fi fi
currentWindowId () { currentWindowId () {
if hash osascript 2>/dev/null; then #osx if hash osascript 2>/dev/null; then #osx
osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0" osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
elif hash notify-send 2>/dev/null; then #ubuntu! elif (hash notify-send 2>/dev/null || hash kdialog 2>/dev/null); then #ubuntu!
xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }' xprop -root 2> /dev/null | awk '/NET_ACTIVE_WINDOW/{print $5;exit} END{exit !$5}' || echo "0"
else else
echo $EPOCHSECONDS #fallback for windows echo $EPOCHSECONDS #fallback for windows
fi fi
} }
bgnotify () { bgnotify () { ## args: (title, subtitle)
if hash terminal-notifier 2>/dev/null; then #osx if hash terminal-notifier 2>/dev/null; then #osx
terminal-notifier -message "$2" -title "$1" [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2' ||
[[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] && term_id='com.apple.terminal';
## now call terminal-notifier, (hopefully with $term_id!)
[ -z "$term_id" ] && terminal-notifier -message "$2" -title "$1" >/dev/null ||
terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
elif hash growlnotify 2>/dev/null; then #osx growl elif hash growlnotify 2>/dev/null; then #osx growl
growlnotify -m "$1" "$2" growlnotify -m "$1" "$2"
elif hash notify-send 2>/dev/null; then #ubuntu! elif hash notify-send 2>/dev/null; then #ubuntu gnome!
notify-send "$1" "$2" notify-send "$1" "$2"
elif hash kdialog 2>/dev/null; then #ubuntu kde!
kdialog -title "$1" --passivepopup "$2" 5
elif hash notifu 2>/dev/null; then #cygwyn support! elif hash notifu 2>/dev/null; then #cygwyn support!
notifu /m "$2" /p "$1" notifu /m "$2" /p "$1"
fi fi
@ -46,7 +53,7 @@ bgnotify () {
bgnotify_begin() { bgnotify_begin() {
bgnotify_timestamp=$EPOCHSECONDS bgnotify_timestamp=$EPOCHSECONDS
bgnotify_lastcmd=$1 bgnotify_lastcmd="$1"
bgnotify_windowid=$(currentWindowId) bgnotify_windowid=$(currentWindowId)
} }
@ -63,5 +70,8 @@ bgnotify_end() {
bgnotify_timestamp=0 #reset it to 0! bgnotify_timestamp=0 #reset it to 0!
} }
add-zsh-hook preexec bgnotify_begin ## only enable if a local (non-ssh) connection
add-zsh-hook precmd bgnotify_end if [ -z "$SSH_CLIENT" ] && [ -z "$SSH_TTY" ]; then
add-zsh-hook preexec bgnotify_begin
add-zsh-hook precmd bgnotify_end
fi