X-Git-Url: http://git.tpope.net/?p=tpope-extra.git;a=blobdiff_plain;f=bin%2Faway-detect;h=72d83ff3c04d700173886d10ad66de4cf3d6eaab;hp=d6245c660648365452c2688017b028b80329a40f;hb=bc83d0e12d5f3a428a34c90b6acbbd072c7606c5;hpb=51068517d036b37e4ab86bfdde9a7708351316b0

diff --git a/bin/away-detect b/bin/away-detect
index d6245c6..72d83ff 100755
--- a/bin/away-detect
+++ b/bin/away-detect
@@ -69,16 +69,28 @@ set_active() {
 
 now="$(expr 60 \* $(date +%H) + $(date +%M))"
 
-today|sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
+if today --category='holiday' | ! grep '' >/dev/null; then
+today --category='school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
+while read times event; do
+    begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))"
+    end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))"
+    max_end="$end"
+    begin="`expr $begin - 15`"
+    end="`expr $begin / 2 + $end / 2`"
+    if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
+	echo "scheduled=\"Class ($event)\"" > "$HOME/.away-smart"
+	break
+    elif [ "$old_away" = "$event" -a "$now" -gt "$max_end" ]; then
+	echo "old_smart=\"$old_away\"" > "$HOME/.away-smart"
+    fi
+done
+fi
+
+today --category='!school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
 while read times event; do
     begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))"
     end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))"
     max_end="$end"
-    case "$event" in
-	*[Cc]lass*) begin="`expr $begin - 10`"
-	    end="`expr $begin / 2 + $end / 2`"
-	;;
-    esac
     if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
 	echo "scheduled=\"$event\"" > "$HOME/.away-smart"
 	break