X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x2%2Fsrc%2Fawk%2Fexe%2Fbar.awk;h=1868f0e96bc63eac4915eab2398d10a263dcf0f4;hb=e05c10ea70078771831aeb19ce9b01a730c26996;hp=adf09b4a2b5c34b4c963163ea5184d4b409ddd92;hpb=774d8cd199b129348c01aaa74e364cd67bec335c;p=khatus.git

diff --git a/x2/src/awk/exe/bar.awk b/x2/src/awk/exe/bar.awk
index adf09b4..1868f0e 100644
--- a/x2/src/awk/exe/bar.awk
+++ b/x2/src/awk/exe/bar.awk
@@ -152,9 +152,19 @@ function bar_make_status_disk_io_r(    src) {
 # Network
 # -----------------------------------------------------------------------------
 
+function bar_make_status_net_iface_status(interface,    is_plugged_in) {
+    # TODO: Integrate connection/address status into the symbol somehow.
+    cache_get(is_plugged_in, "khatus_sensor_net_carrier", interface, 5)
+    if (!is_plugged_in["is_expired"] && is_plugged_in["value"] == 1)
+        return "<>"
+    else
+        return "--"
+}
+
 function bar_make_status_net_addr(interface,    src) {
     src = "khatus_sensor_net_addr_io"
-    return cache_get_fmt_def(src, "addr" Kfs interface, 5, "%s", "")
+    addr = cache_get_fmt_def(src, "addr" Kfs interface, 5, "%s")
+    return addr ? addr : "--"
 }
 
 function bar_make_status_net_io_w(interface,    src) {
@@ -172,10 +182,26 @@ function bar_make_status_net_wifi(interface,    src) {
     return cache_get_fmt_def(src, "status" Kfs interface, 10, "%s")
 }
 
+function bar_make_status_net_wifi_link(interface,    link) {
+    cache_get(link, "khatus_sensor_net_wifi_status", "link" Kfs interface, 10)
+    if (!link["is_expired"] && link["value"] > 0)
+        return sprintf("%d%%", link["value"])
+    else
+        return "--"
+}
+
 # -----------------------------------------------------------------------------
 # Bluetooth
 # -----------------------------------------------------------------------------
 
+function bar_make_status_bluetooth(    src, controllers, devices) {
+    src = "khatus_sensor_bluetooth"
+    controllers = cache_get_fmt_def(src, "count_powered_controllers", 10, "%d")
+    devices     = cache_get_fmt_def(src, "count_connected_devices"  , 10, "%d")
+    # Using %s format bellow because default value is a string
+    return sprintf("%s:%s", controllers, devices)
+}
+
 function bar_make_status_bluetooth_power(    src) {
     src = "khatus_sensor_bluetooth_power"
     return cache_get_fmt_def(src, "power_status", 10, "%s")
@@ -223,9 +249,9 @@ function bar_make_status_mpd(    state, status) {
         if (state["value"] == "play") {
             status = bar_make_status_mpd_state_known("▶")
         } else if (state["value"] == "pause") {
-            status = bar_make_status_mpd_state_known("❚❚")
+            status = bar_make_status_mpd_state_known("⏸")
         } else if (state["value"] == "stop") {
-            status = bar_make_status_mpd_state_known("⬛")
+            status = bar_make_status_mpd_state_known("⏹")
         } else {
             msg_out_log_error(\
                 "bar_make_status_mpd", \
@@ -241,11 +267,11 @@ function bar_make_status_mpd(    state, status) {
 
 function bar_make_status_mpd_state_known(symbol,    s, song, time, percentage) {
     s = "khatus_sensor_mpd"
-    song    = cache_get_fmt_def(s, "song"                   , 5, "%s", "?")
+    #song    = cache_get_fmt_def(s, "song"                   , 5, "%s", "?")
     time    = cache_get_fmt_def(s, "play_time_minimal_units", 5, "%s", "?")
     percent = cache_get_fmt_def(s, "play_time_percentage"   , 5, "%s", "?")
-    song    = substr(song, 1, Opt_Mpd_Song_Max_Chars)
-    return sprintf("%s %s %s %s", symbol, time, percent, song)
+    #song    = substr(song, 1, Opt_Mpd_Song_Max_Chars)
+    return sprintf("%s %s %s", symbol, time, percent)
 }
 
 # -----------------------------------------------------------------------------