home
/
code
/
khatus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not rely on FS for msg parsing
[khatus.git]
/
src
/
awk
/
exe
/
bar.awk
diff --git
a/src/awk/exe/bar.awk
b/src/awk/exe/bar.awk
old mode 100755
(executable)
new mode 100644
(file)
index
9be1adb
..
b902448
--- a/
src/awk/exe/bar.awk
+++ b/
src/awk/exe/bar.awk
@@
-10,18
+10,23
@@
# -----------------------------------------------------------------------------
# Input
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# Input
# -----------------------------------------------------------------------------
-$1 == "OK" {
- cache_update()
+{
+ delete msg
+ msg_parse(msg, $0)
}
}
-$1 == "OK" && \
-$2 == "khatus_sensor_datetime" {
+msg["type"] == "data" {
+ cache_update(msg["node"], msg["module"], msg["key"], msg["val"])
+}
+
+msg["node"] == Node && \
+msg["module"] == "khatus_sensor_datetime" && \
+msg["type"] == "data" {
# Code for bar_make_status is expected to be passed as an
# additional source file, using -f flag.
# Code for bar_make_status is expected to be passed as an
# additional source file, using -f flag.
- msg_out_
ok("status_bar",
bar_make_status())
+ msg_out_
status_bar(
bar_make_status())
}
}
-
# -----------------------------------------------------------------------------
# Energy
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# Energy
# -----------------------------------------------------------------------------
@@
-54,7
+59,7
@@
function bar_make_status_mem_percent( total, used, percent, percent_str) {
!used["is_expired"] && \
total["value"] \
) {
!used["is_expired"] && \
total["value"] \
) {
- percent =
util
_round((used["value"] / total["value"]) * 100)
+ percent =
num
_round((used["value"] / total["value"]) * 100)
percent_str = sprintf("%d", percent)
} else {
percent_str = "__"
percent_str = sprintf("%d", percent)
} else {
percent_str = "__"
@@
-198,7
+203,7
@@
function bar_make_status_volume_pulseaudio_sink(sink, mu, vl, vr, show) {
if (mu["value"] == "yes") {show = "X"}
else if (mu["value"] == "no") {show = vl["value"] " " vr["value"]}
else {
if (mu["value"] == "yes") {show = "X"}
else if (mu["value"] == "no") {show = vl["value"] " " vr["value"]}
else {
- msg_out_error(\
+ msg_out_
log_
error(\
"bar_make_status_volume_pulseaudio_sink: " sink ". ", \
"Unexpected value for 'mute' field: " mu["value"] \
)
"bar_make_status_volume_pulseaudio_sink: " sink ". ", \
"Unexpected value for 'mute' field: " mu["value"] \
)
@@
-221,7
+226,7
@@
function bar_make_status_mpd( state, status) {
} else if (state["value"] == "stop") {
status = bar_make_status_mpd_state_known("⬛")
} else {
} else if (state["value"] == "stop") {
status = bar_make_status_mpd_state_known("⬛")
} else {
- msg_out_error(\
+ msg_out_
log_
error(\
"bar_make_status_mpd", \
"Unexpected value for 'state' field: " state["value"] \
)
"bar_make_status_mpd", \
"Unexpected value for 'state' field: " state["value"] \
)
This page took
0.027273 seconds
and
4
git commands to generate.