@@ -14,8 +14,19 @@ source ~/main/scripts/gb-network.sh
1414# # ⮟ U+2B9F
1515# # ⮜ U+2B9C
1616# # ⮞ U+2B9E
17- down_icon=" <span color=\" ${gruvbox_blue_d} \" >⮟ </span>"
18- up_icon=" <span color=\" ${gruvbox_purple_d} \" >⮝ </span>"
17+ # # ▲ ▼
18+ down_icon=" <span color=\" ${gruvbox_blue_d} \" >⮟</span>"
19+ up_icon=" <span color=\" ${gruvbox_purple_d} \" >⮝</span>"
20+
21+ total_color_low=" $gruvbox_gray_d "
22+ total_color_medium=" $gruvbox_gray_d "
23+ total_color_high=" $gruvbox_purple "
24+ total_color_ultRRRigh=" $gruvbox_red "
25+
26+ diff_color_low=" $gruvbox_fg "
27+ diff_color_medium=" $gruvbox_fg "
28+ diff_color_high=" $gruvbox_blue "
29+ diff_color_ultRRRigh=" $gruvbox_green "
1930
2031diff_text=' '
2132total_text=' '
@@ -32,45 +43,41 @@ connection_text="${wf_conn}${eth_conn}${if_simcard}${if_wf_down}${vpn_conn}"
3243# # total and diff -----------------------
3344# # https://www.adminsehow.com/2010/03/shell-script-to-show-network-speed/
3445
35- for interface in ' wifi' ' ethernet' ; {
36- case " $interface " in
46+ for adapter in ' wifi' ' ethernet' ; {
47+ case " $adapter " in
3748 wifi )
3849 device_name=" $wf_devc "
39- interface_state =" $wf_state "
50+ adapter_state =" $wf_state "
4051 ;;
4152 ethernet )
4253 device_name=" $eth_devc "
43- interface_state =" $eth_state "
54+ adapter_state =" $eth_state "
4455 ;;
4556 esac
4657
47- [ " $interface_state " == ' connected' || continue
58+ [ " $adapter_state " == ' connected' || continue
4859
49- down_last_file=~ /main/scripts/.last/network_" ${interface} "
50- up_last_file=~ /main/scripts/.last/network_" ${interface} "
60+ # # get total last
61+ down_total_last=" $( redis-cli GET " awesome_widget__${adapter} _down" ) " # # 19410508
62+ up_total_last=" $( redis-cli GET " awesome_widget__${adapter} _up" ) " # # 19410508
63+ # #
64+ [ " $down_total_last " || down_total_last=0
65+ [ " $up_total_last " || up_total_last=0
5166
52- # # get last total down/up
53- down_total_last=" $( < " $down_last_file " ) " || down_total_last=0 # # 19410508 ## NOTE do NOT add 2>/dev/null
54- up_total_last=" $( < " $up_last_file " ) " || up_total_last=0 # # 19410508 ## NOTE do NOT add 2>/dev/null
5567
56- # # get down_total_now/up_total_now
57- # # NOTE do NOT replace " with ' in awk
58- totals_now =" $( \g rep " $device_name " | awk ' {print "down_total_now="$2, "up_total_now="$10}' ) "
59- eval " $totals_now " # # 19410509 789384
68+ # # get total now
69+ # # NOTE do NOT " -> ' in awk
70+ _totals_now =" $( \g rep " $device_name " | awk ' {print "down_total_now="$2, "up_total_now="$10}' ) "
71+ eval " $_totals_now " # # 19410509 789384
6072
61- # # save down_total_now/up_total_now as last
62- # # for our next read
73+
74+ # # save for our next read
6375 # # (in bytes, before converting them)
64- printf ' %s\n ' " $down_total_now " > " $down_last_file "
65- printf ' %s\n ' " $up_total_now " > " $up_last_file "
76+ redis-cli SET " awesome_widget__ ${adapter} _down " " $down_total_now " || msgn ' ERROR saving down_total_now '
77+ redis-cli SET " awesome_widget__ ${adapter} _up " " $up_total_now " || msgn ' ERROR saving up_total_now '
6678
6779 # # ---
68-
69- # # set color for down_total_now/up_total_now
70- total_color_low=" $gruvbox_gray_d "
71- total_color_medium=" $gruvbox_gray_d "
72- total_color_high=" $gruvbox_purple "
73- total_color_ultRRRigh=" $gruvbox_red "
80+ # # set total color
7481
7582 if (( down_total_now < "$K " )) ; then down_total_color=" $total_color_low " # # is B
7683 elif (( down_total_now < "$M " )) ; then down_total_color=" $total_color_low " # # is K
@@ -79,7 +86,6 @@ for interface in 'wifi' 'ethernet'; {
7986 elif (( down_total_now < "$G " )) ; then down_total_color=" $total_color_high " # # is below 1G
8087 else down_total_color=" $total_color_ultRRRigh " # # is 1G or higher
8188 fi
82- down_total_conv=" <span color=\" ${down_total_color} \" >$( convert_byte " $down_total_now " ) " # # 4.32G
8389
8490 if (( up_total_now < "$K " )) ; then up_total_color=" $total_color_low " # # is B
8591 elif (( up_total_now < "$M " )) ; then up_total_color=" $total_color_low " # # is K
@@ -88,47 +94,48 @@ for interface in 'wifi' 'ethernet'; {
8894 elif (( up_total_now < "$G " )) ; then up_total_color=" $total_color_high " # # is below 1G
8995 else up_total_color=" $total_color_ultRRRigh " # # is 1G or higher
9096 fi
91- up_total_conv=" <span color=\" ${up_total_color} \" >$( convert_byte " $up_total_now " ) " # # 4.32G
9297
9398 # # ---
94- # # calculate down_diff/up_diff
99+ # # convert total
95100
96- # # for n seconds (i.e. network_refresh_interval seconds)
97- (( down_diff= "down_total_now - down_total_last" )) # # 1341440
98- (( up_diff= "up_total_now - up_total_last" )) # # 1341440
99- # #
100- # # average for one second
101- (( down_diff= "down_diff / network_refresh_interval" ))
102- (( up_diff= "up_diff / network_refresh_interval" ))
101+ down_total_conv=" <span color=\" ${down_total_color} \" >$( convert_byte " $down_total_now " ) " # # 4.32G
102+ up_total_conv=" <span color=\" ${up_total_color} \" >$( convert_byte " $up_total_now " ) " # # 4.32G
103103
104104 # # ---
105- # # set color for down_diff/up_diff
105+ # # calculate diff
106+
107+ # # devided by network_refresh_interval
108+ # # to get average for 1 second
109+ (( down_diff= "(down_total_now - down_total_last) / network_refresh_interval" )) # # 1341440
110+ (( up_diff= "(up_total_now - up_total_last) / network_refresh_interval" )) # # 1341440
106111
107- diff_color_low=" $gruvbox_fg "
108- diff_color_medium=" $gruvbox_fg "
109- diff_color_high=" $gruvbox_blue "
110- diff_color_ultRRRigh=" $gruvbox_green "
112+ # # ---
113+ # # set diff color
111114
112115 if (( down_diff < "$K " )) ; then down_diff_color=" $diff_color_low " # # is B
113116 elif (( down_diff < "$K_400 " )) ; then down_diff_color=" $diff_color_low " # # is below 400K
114117 elif (( down_diff < "$K_700 " )) ; then down_diff_color=" $diff_color_medium " # # is below 700K
115118 elif (( down_diff < "$M " )) ; then down_diff_color=" $diff_color_high " # # is below 1M
116119 else down_diff_color=" $diff_color_ultRRRigh " # # is M or G
117120 fi
118- down_diff_conv=" <span color=\" ${down_diff_color} \" >$( convert_byte " $down_diff " ) " # # 1.31M
119121
120122 if (( up_diff < "$K " )) ; then up_diff_color=" $diff_color_low " # # is B
121123 elif (( up_diff < "$K_400 " )) ; then up_diff_color=" $diff_color_low " # # is below 400K
122124 elif (( up_diff < "$K_700 " )) ; then up_diff_color=" $diff_color_medium " # # is below 700K
123125 elif (( up_diff < "$M " )) ; then up_diff_color=" $diff_color_high " # # is below 1M
124126 else up_diff_color=" $diff_color_ultRRRigh " # # is M or G
125127 fi
128+
129+ # # ---
130+ # # convert diff
131+
132+ down_diff_conv=" <span color=\" ${down_diff_color} \" >$( convert_byte " $down_diff " ) " # # 1.31M
126133 up_diff_conv=" <span color=\" ${up_diff_color} \" >$( convert_byte " $up_diff " ) " # # 1.31M
127134
128135 # # ---
129136
130- diff_text+=" | ${down_icon}${down_diff_conv} ${up_icon}${up_diff_conv} " # # 317K 2.31M
131- total_text+=" | ${down_icon}${down_total_conv} ${up_icon}${up_total_conv} " # # 4.32G 4.32G
137+ diff_text+=" | ${down_icon} ${down_diff_conv} ${up_icon} ${up_diff_conv} " # # 317K 2.31M
138+ total_text+=" | ${down_icon} ${down_total_conv} ${up_icon} ${up_total_conv} " # # 4.32G 4.32G
132139}
133140
134141# # remove leading ' | '
0 commit comments