Use mpd song title if available

[khatus.git] / bin / khatus_show

diff --git a/bin/khatus_show b/bin/khatus_show
index 523f22a..69024fd 100755 (executable)
--- a/bin/khatus_show
+++ b/bin/khatus_show
@@ -99,7 +99,7 @@ network=$(
             bytes_per_unit = 1024 * 1024
         }
 
-        /^[0-9]/ {
+        /^[0-9]+:/ {
             sub(":$", "", $1)
             sub(":$", "", $2)
             sequence = $1
@@ -134,26 +134,29 @@ network=$(
                     getline prev_read < prev_read_file
                     getline prev_write < prev_write_file
 
-                    diff_r = (curr_read  - prev_read ) / bytes_per_unit
-                    diff_w = (curr_write - prev_write) / bytes_per_unit
+                    diff_read    = (curr_read  - prev_read ) / bytes_per_unit
+                    diff_written = (curr_write - prev_write) / bytes_per_unit
 
                     print curr_read  > prev_read_file
                     print curr_write > prev_write_file
 
-                    if (interface == "wlp3s0") {
-                        label = wifi_conn
-                    } else {
-                        label = interface
-                    }
+                    io_stat = sprintf("%0.3f▲ %0.3f▼", diff_written, diff_read)
+                } else {
+                    io_stat = "--"
+                }
 
-                    if (i == sequence) {
-                        sep = ""
-                    } else {
-                        sep = " | "
-                    }
+                label = substr(interface, 1, 1)
+                if (interface == "wlp3s0") {
+                    label = label ":" wifi_conn
+                }
 
-                    printf("%s %0.3f▲ %0.3f▼%s", label, diff_w, diff_r, sep)
+                if (i == sequence) {
+                    sep = ""
+                } else {
+                    sep = " | "
                 }
+
+                printf("%s:%s%s", label, io_stat, sep)
             }
         }'
 )
@@ -390,6 +393,8 @@ mpd_current=$(
         END {
             if (data["Name:"]) {
                 out = data["Name:"]
+            } else if (data["Title:"]) {
+                out = data["Title:"]
             } else {
                 file = data["file:"]
                 last = split(file, parts, "/")
@@ -419,31 +424,22 @@ echo \
 "\
  E$energy\
  \
- \
  G=$graphics_card\
  \
- \
  M$memory\
  \
- \
  C=[$cpu  ${temp}°C ${fan}rpm]\
  \
- \
  L=$load\
  \
- \
  D$disk\
  \
- \
  N:[$network]\
  \
- \
  B:$bluetooth_power\
  \
- \
  S=$screen_brightness\
  \
- \
  V=$volume\
  \
  [$mpd_state $mpd_current]\