Implement colour and view template support for CPU counter

Author: samoshkin

scripts/cpu.sh

@@ -8,24 +8,56 @@ source "$CURRENT_DIR/helpers.sh"
 
 refresh_interval=$(get_tmux_option "status-interval" "5")
 
-print_cpu_usage() {
+cpu_view_tmpl=$(get_tmux_option "@sysstat_cpu_view_tmpl" '#[fg=#{cpu.color}]#{cpu.pused}#[default]')
+
+cpu_medium_threshold=$(get_tmux_option "@sysstat_cpu_medium_threshold" "30")
+cpu_high_threshold=$(get_tmux_option "@sysstat_cpu_high_threshold" "80")
+
+cpu_color_low=$(get_tmux_option "@sysstat_cpu_color_low" "green")
+cpu_color_medium=$(get_tmux_option "@sysstat_cpu_color_medium" "yellow")
+cpu_color_high=$(get_tmux_option "@sysstat_cpu_color_high" "red")
+
+get_cpu_color(){
+  local cpu_used=$1
+
+  if fcomp "$cpu_high_threshold" "$cpu_used"; then
+    echo "$cpu_color_high";
+  elif fcomp "$cpu_medium_threshold" "$cpu_used"; then
+    echo "$cpu_color_medium";
+  else
+    echo "$cpu_color_low";
+  fi
+}
+
+get_cpu_usage() {
   if is_osx; then
     if command_exists "iostat"; then
-      iostat -c 2 -w "$refresh_interval" | tail -n 1 | awk '{ printf "%.1f%%", 100-$6 }'
+      iostat -c 2 -w "$refresh_interval" | tail -n 1 | awk '{ print 100-$6 }'
     else
-      top -l 2 -s "$refresh_interval" -n 0 | sed -nr '/CPU usage/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)%[[:space:]]*idle.*/\1/p' | tail -n 1 | awk '{ printf "%.1f%%", 100-$0 }'
+      top -l 2 -s "$refresh_interval" -n 0 | sed -nr '/CPU usage/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)%[[:space:]]*idle.*/\1/p' | tail -n 1 | awk '{ print 100-$0 }'
     fi
   else
     if command_exists "vmstat"; then
-      vmstat -n "$refresh_interval" 2 | tail -n 1 | awk '{printf "%.1f%%", 100-$(NF-2)}'
+      vmstat -n "$refresh_interval" 2 | tail -n 1 | awk '{print 100-$(NF-2)}'
     else
-      top -b -n 2 -d "$refresh_interval" | sed -nr '/%Cpu/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)[[:space:]]*id.*/\1/p' | tail -n 1 | awk '{ printf "%.1f%%", 100-$0 }'
+      top -b -n 2 -d "$refresh_interval" | sed -nr '/%Cpu/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)[[:space:]]*id.*/\1/p' | tail -n 1 | awk '{ print 100-$0 }'
     fi
   fi
 }
 
+print_cpu_usage() {
+  local cpu_pused=$(get_cpu_usage)
+
+  local cpu_color=$(get_cpu_color "$cpu_pused")
+  
+  local cpu_view="$cpu_view_tmpl"
+  cpu_view="${cpu_view//'#{cpu.pused}'/$(printf "%.1f%%" "$cpu_pused")}"
+  cpu_view="${cpu_view//'#{cpu.color}'/$cpu_color}"
+
+  echo $cpu_view
+}
+
 main(){
-  echo "$(date)" >> ~/.tmux/sysstat_cpu.log
   print_cpu_usage
 }
 

scripts/mem.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# TODO: add option to choose size unit: M|G
+
 set -u
 set -e