db["volume"] = $0
}
-# -----------------------------------------------------------------------------
-# BEGIN MPD_SONG
-/^in:MPD_SONG +OK +/\
-{
- delete db["mpd_song_curr_file"]
- delete db["mpd_song_curr_title"]
- delete db["mpd_song_curr_name"]
-}
-
-/^in:MPD_SONG +file:/\
-{
- fields_shift()
- fields_shift()
- db["mpd_song_curr_file"] = $0
-}
-
-/^in:MPD_SONG +Title:/\
-{
- fields_shift()
- fields_shift()
- db["mpd_song_curr_title"] = $0
-}
-
-/^in:MPD_SONG +Name:/\
-{
- fields_shift()
- fields_shift()
- db["mpd_song_curr_name"] = $0
-}
-
-/^in:MPD_SONG +OK$/\
-{
- set_mpd_playing()
-}
-# END MPD_SONG
-# -----------------------------------------------------------------------------
+/^in:MPD_SONG OK +MPD/ { delete db_mpd_song; next }
+/^in:MPD_SONG OK$/ { set_mpd_playing() ; next }
+/^in:MPD_SONG / { set_mpd_song() ; next }
/^in:MPD_STATE /\
{
output_msg_status_bar(make_status_bar())
}
+function set_mpd_song( key, val) {
+ key = $2
+ fields_shift()
+ fields_shift()
+ val = $0
+ db_mpd_song[key] = val
+ debug("set_mpd_song", "", db_mpd_song)
+}
+
function set_mpd_playing( \
currently_playing, name, title, file, last, parts\
) {
- name = db["mpd_song_curr_name"]
- title = db["mpd_song_curr_title"]
- file = db["mpd_song_curr_file"]
+ debug("set_mpd_playing", "", db_mpd_song)
+ name = db_mpd_song["Name:"]
+ title = db_mpd_song["Title:"]
+ file = db_mpd_song["file:"]
if (name) {
currently_playing = name
alert_check_mpd()
}
-function alert_check_mpd( curr, prev) {
+function alert_check_mpd( curr, prev, name, body) {
prev = db["mpd_playing_prev"]
curr = db["mpd_playing_curr"]
if (curr && curr != prev) {
- alert_trigger_low("alert_check_mpd", "NowPlaying", curr)
+ name = db_mpd_song["Name:"]
+ if (name) {
+ body = name
+ } else {
+ body = \
+ db_mpd_song["Artist:"] \
+ " - " db_mpd_song["Album:"] \
+ " - " db_mpd_song["Title:"]
+ }
+ alert_trigger_low("alert_check_mpd", "NowPlaying", body)
}
}
dbg["state_curr"] = state_curr
dbg["remaining"] = remaining
- debug(from, dbg)
+ debug(from, "", dbg)
if (state_curr == "discharging") {
if (state_prev == "charging") {
- alert_trigger_low(from, "Unplugged", "")
+ alert_trigger_low(from, "PowerUnplugged", "")
}
if (remaining < 5) {
dbg["head"] = $1
sub("^" $1 " +", "")
dbg["body"] = $0
- debug("fields_shift", dbg)
+ debug("fields_shift", "", dbg)
}
function make_status_bar( position, bar, sep, i, j) {
return int(n + 0.5)
}
-function debug(location, values, sep, vals, key, msg) {
+function debug(location, msg, values, sep, vals, key, payload) {
if (opt_debug) {
sep = ""
vals = ""
vals = sprintf("%s%s%s: %s", vals, sep, key, values[key])
sep = ", "
}
- msg = location " ==> " vals "."
- output_msg("DEBUG", msg, "/dev/stderr")
+ payload = sprintf("[%s] [%s] [%s]", location, msg, vals)
+ output_msg("DEBUG", payload, "/dev/stderr")
}
}