Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set P9K_IP_TX_RATE and P9K_IP_RX_RATE to empty instead of 0 when unable to get the real values

Browse Source
pull/527/head
romkatv 5 years ago
parent cfc76c8856
commit 1885d15da2
5 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
config/p10k-classic.zsh
Unescape Escape View File

@ -1320,7 +1320,7 @@
# P9K_IP_TX_BYTES | total number of bytes sent # P9K_IP_TX_BYTES | total number of bytes sent
# P9K_IP_RX_RATE | receive rate (since last prompt) # P9K_IP_RX_RATE | receive rate (since last prompt)
# P9K_IP_TX_RATE | send rate (since last prompt) # P9K_IP_TX_RATE | send rate (since last prompt)
typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='%70F⇣$P9K_IP_RX_RATE %215F⇡$P9K_IP_TX_RATE %38F$P9K_IP_IP' typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='${P9K_IP_RX_RATE:+%70F⇣$P9K_IP_RX_RATE }${P9K_IP_TX_RATE:+%215F⇡$P9K_IP_TX_RATE }%38F$P9K_IP_IP'
# Show information for the first network interface whose name matches this regular expression. # Show information for the first network interface whose name matches this regular expression.
# Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces.
typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' typeset -g POWERLEVEL9K_IP_INTERFACE='e.*'

2
config/p10k-lean-8colors.zsh
Unescape Escape View File

@ -1299,7 +1299,7 @@
# P9K_IP_TX_BYTES | total number of bytes sent # P9K_IP_TX_BYTES | total number of bytes sent
# P9K_IP_RX_RATE | receive rate (since last prompt) # P9K_IP_RX_RATE | receive rate (since last prompt)
# P9K_IP_TX_RATE | send rate (since last prompt) # P9K_IP_TX_RATE | send rate (since last prompt)
typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP %2F⇣$P9K_IP_RX_RATE %3F⇡$P9K_IP_TX_RATE' typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %2F⇣$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %3F⇡$P9K_IP_TX_RATE}'
# Show information for the first network interface whose name matches this regular expression. # Show information for the first network interface whose name matches this regular expression.
# Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces.
typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' typeset -g POWERLEVEL9K_IP_INTERFACE='e.*'

2
config/p10k-lean.zsh
Unescape Escape View File

@ -1299,7 +1299,7 @@
# P9K_IP_TX_BYTES | total number of bytes sent # P9K_IP_TX_BYTES | total number of bytes sent
# P9K_IP_RX_RATE | receive rate (since last prompt) # P9K_IP_RX_RATE | receive rate (since last prompt)
# P9K_IP_TX_RATE | send rate (since last prompt) # P9K_IP_TX_RATE | send rate (since last prompt)
typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP %70F⇣$P9K_IP_RX_RATE %215F⇡$P9K_IP_TX_RATE' typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %70F⇣$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %215F⇡$P9K_IP_TX_RATE}'
# Show information for the first network interface whose name matches this regular expression. # Show information for the first network interface whose name matches this regular expression.
# Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces.
typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' typeset -g POWERLEVEL9K_IP_INTERFACE='e.*'

2
config/p10k-rainbow.zsh
Unescape Escape View File

@ -1383,7 +1383,7 @@
# P9K_IP_TX_BYTES | total number of bytes sent # P9K_IP_TX_BYTES | total number of bytes sent
# P9K_IP_RX_RATE | receive rate (since last prompt) # P9K_IP_RX_RATE | receive rate (since last prompt)
# P9K_IP_TX_RATE | send rate (since last prompt) # P9K_IP_TX_RATE | send rate (since last prompt)
typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='⇣$P9K_IP_RX_RATE ⇡$P9K_IP_TX_RATE $P9K_IP_IP' typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='${P9K_IP_RX_RATE:+⇣$P9K_IP_RX_RATE }${P9K_IP_TX_RATE:+⇡$P9K_IP_TX_RATE }$P9K_IP_IP'
# Show information for the first network interface whose name matches this regular expression. # Show information for the first network interface whose name matches this regular expression.
# Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces.
typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' typeset -g POWERLEVEL9K_IP_INTERFACE='e.*'

28
internal/p10k.zsh
Unescape Escape View File

@ -5015,15 +5015,14 @@ function _p9k_prompt_net_iface_async() {
fi fi
if _p9k_prompt_net_iface_match $_POWERLEVEL9K_IP_INTERFACE; then if _p9k_prompt_net_iface_match $_POWERLEVEL9K_IP_INTERFACE; then
local ip_ip=$ip ip_interface=$iface ip_timestamp=$EPOCHREALTIME local ip_ip=$ip ip_interface=$iface ip_timestamp=$EPOCHREALTIME
local ip_tx_bytes=0 ip_rx_bytes=0 ip_tx_rate='0 B/s' ip_rx_rate='0 B/s' local ip_tx_bytes ip_rx_bytes ip_tx_rate ip_rx_rate
if [[ $_p9k_os == (Linux|Android) ]]; then if [[ $_p9k_os == (Linux|Android) ]]; then
if [[ -r /sys/class/net/$iface/statistics/rx_bytes ]] && if [[ -r /sys/class/net/$iface/statistics/tx_bytes &&
_p9k_read_file /sys/class/net/$iface/statistics/rx_bytes; then -r /sys/class/net/$iface/statistics/rx_bytes ]]; then
ip_rx_bytes=$_p9k__ret _p9k_read_file /sys/class/net/$iface/statistics/tx_bytes &&
fi [[ $_p9k__ret == <-> ]] && ip_tx_bytes=$_p9k__ret &&
if [[ -r /sys/class/net/$iface/statistics/tx_bytes ]] && _p9k_read_file /sys/class/net/$iface/statistics/rx_bytes &&
_p9k_read_file /sys/class/net/$iface/statistics/tx_bytes; then [[ $_p9k__ret == <-> ]] && ip_rx_bytes=$_p9k__ret || { ip_tx_bytes=; ip_rx_bytes=; }
ip_tx_bytes=$_p9k__ret
fi fi
elif [[ $_p9k_os == (BSD|OSX) && $+commands[netstat] == 1 ]]; then elif [[ $_p9k_os == (BSD|OSX) && $+commands[netstat] == 1 ]]; then
local -a lines local -a lines
@ -5031,23 +5030,32 @@ function _p9k_prompt_net_iface_async() {
local header=($=lines[1]) local header=($=lines[1])
local -i rx_idx=$header[(Ie)Ibytes] local -i rx_idx=$header[(Ie)Ibytes]
local -i tx_idx=$header[(Ie)Obytes] local -i tx_idx=$header[(Ie)Obytes]
if (( rx_idx && tx_idx )); then
ip_tx_bytes=0
ip_rx_bytes=0
for line in ${lines:1}; do for line in ${lines:1}; do
(( ip_rx_bytes += ${line[(w)rx_idx]} )) (( ip_rx_bytes += ${line[(w)rx_idx]} ))
(( ip_tx_bytes += ${line[(w)tx_idx]} )) (( ip_tx_bytes += ${line[(w)tx_idx]} ))
done done
fi fi
fi fi
fi
if [[ -n $ip_rx_bytes ]]; then
if [[ $ip_ip == $P9K_IP_IP && $iface == $P9K_IP_INTERFACE ]]; then if [[ $ip_ip == $P9K_IP_IP && $iface == $P9K_IP_INTERFACE ]]; then
local -F t='ip_timestamp - _p9__ip_timestamp' local -F t='ip_timestamp - _p9__ip_timestamp'
if (( t <= 0 )); then if (( t <= 0 )); then
ip_tx_rate=$P9K_IP_TX_RATE ip_tx_rate=${P9K_IP_TX_RATE:-0 B/s}
ip_rx_rate=$P9K_IP_RX_RATE ip_rx_rate=${P9K_IP_RX_RATE:-0 B/s}
else else
_p9k_human_readable_bytes $(((ip_tx_bytes - P9K_IP_TX_BYTES) / t)) _p9k_human_readable_bytes $(((ip_tx_bytes - P9K_IP_TX_BYTES) / t))
[[ $_p9k__ret == *B ]] && ip_tx_rate="$_p9k__ret[1,-2] B/s" || ip_tx_rate="$_p9k__ret[1,-2] $_p9k__ret[-1]iB/s" [[ $_p9k__ret == *B ]] && ip_tx_rate="$_p9k__ret[1,-2] B/s" || ip_tx_rate="$_p9k__ret[1,-2] $_p9k__ret[-1]iB/s"
_p9k_human_readable_bytes $(((ip_rx_bytes - P9K_IP_RX_BYTES) / t)) _p9k_human_readable_bytes $(((ip_rx_bytes - P9K_IP_RX_BYTES) / t))
[[ $_p9k__ret == *B ]] && ip_rx_rate="$_p9k__ret[1,-2] B/s" || ip_rx_rate="$_p9k__ret[1,-2] $_p9k__ret[-1]iB/s" [[ $_p9k__ret == *B ]] && ip_rx_rate="$_p9k__ret[1,-2] B/s" || ip_rx_rate="$_p9k__ret[1,-2] $_p9k__ret[-1]iB/s"
fi fi
else
ip_tx_rate='0 B/s'
ip_rx_rate='0 B/s'
fi
fi fi
else else
local ip_ip= ip_interface= ip_tx_bytes= ip_rx_bytes= ip_tx_rate= ip_rx_rate= ip_timestamp= local ip_ip= ip_interface= ip_tx_bytes= ip_rx_bytes= ip_tx_rate= ip_rx_rate= ip_timestamp=

Write Preview
Loading…
Cancel
Save