mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-18 05:40:07 +00:00
Better code structure.
This commit is contained in:
parent
da2b8e342e
commit
dad38b0592
1 changed files with 14 additions and 9 deletions
|
@ -224,10 +224,6 @@ prompt_battery() {
|
||||||
# return if there is no battery on system
|
# return if there is no battery on system
|
||||||
[[ -z $(echo $raw_data | grep MaxCapacity) ]] && return
|
[[ -z $(echo $raw_data | grep MaxCapacity) ]] && return
|
||||||
|
|
||||||
# get charge status
|
|
||||||
[[ $(echo $raw_data | grep ExternalConnected | awk '{ print $5 }') =~ "Yes" ]] && local connected=true
|
|
||||||
[[ $(echo $raw_data | grep IsCharging | awk '{ print $5 }') =~ "Yes" ]] && local charging=true
|
|
||||||
|
|
||||||
# convert time remaining from minutes to hours:minutes date string
|
# convert time remaining from minutes to hours:minutes date string
|
||||||
local time_remaining=$(echo $raw_data | grep TimeRemaining | awk '{ print $5 }')
|
local time_remaining=$(echo $raw_data | grep TimeRemaining | awk '{ print $5 }')
|
||||||
if [[ -n $time_remaining ]]; then
|
if [[ -n $time_remaining ]]; then
|
||||||
|
@ -244,12 +240,20 @@ prompt_battery() {
|
||||||
bat_percent=$(( (current_capacity * 100) / max_capacity ))
|
bat_percent=$(( (current_capacity * 100) / max_capacity ))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# logic for string output
|
local remain=""
|
||||||
[[ $charging =~ true && $connected =~ true ]] && local icon_color="$POWERLEVEL9K_BATTERY_CHARGING" && local remain=" ($tstring)"
|
## logic for string output
|
||||||
[[ ! $charging =~ true && $connected =~ true ]] && local icon_color="$POWERLEVEL9K_BATTERY_CHARGED" && local remain=""
|
# Powerplug connected
|
||||||
if [[ ! $connected =~ true ]]; then
|
if [[ $(echo $raw_data | grep ExternalConnected | awk '{ print $5 }') =~ "Yes" ]]; then
|
||||||
|
# Battery is charging
|
||||||
|
if [[ $(echo $raw_data | grep IsCharging | awk '{ print $5 }') =~ "Yes" ]]; then
|
||||||
|
icon_color="$POWERLEVEL9K_BATTERY_CHARGING"
|
||||||
|
remain=" ($tstring)"
|
||||||
|
else
|
||||||
|
icon_color="$POWERLEVEL9K_BATTERY_CHARGED"
|
||||||
|
fi
|
||||||
|
else
|
||||||
[[ $bat_percent -lt $POWERLEVEL9K_BATTERY_LOW_THRESHOLD ]] && local icon_color="$POWERLEVEL9K_BATTERY_LOW_COLOR" || local icon_color="$POWERLEVEL9K_BATTERY_DISCONNECTED"
|
[[ $bat_percent -lt $POWERLEVEL9K_BATTERY_LOW_THRESHOLD ]] && local icon_color="$POWERLEVEL9K_BATTERY_LOW_COLOR" || local icon_color="$POWERLEVEL9K_BATTERY_DISCONNECTED"
|
||||||
local remain=" ($tstring)"
|
remain=" ($tstring)"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -261,6 +265,7 @@ prompt_battery() {
|
||||||
|
|
||||||
# return if no battery found
|
# return if no battery found
|
||||||
[[ -z $bat ]] && return
|
[[ -z $bat ]] && return
|
||||||
|
|
||||||
[[ $(cat $bat/capacity) -gt 100 ]] && local bat_percent=100 || local bat_percent=$(cat $bat/capacity)
|
[[ $(cat $bat/capacity) -gt 100 ]] && local bat_percent=100 || local bat_percent=$(cat $bat/capacity)
|
||||||
[[ $(cat $bat/status) =~ Charging ]] && local connected=true
|
[[ $(cat $bat/status) =~ Charging ]] && local connected=true
|
||||||
[[ $(cat $bat/status) =~ Charging && $bat_percent =~ 100 ]] && local icon_color="$POWERLEVEL9K_BATTERY_CHARGED"
|
[[ $(cat $bat/status) =~ Charging && $bat_percent =~ 100 ]] && local icon_color="$POWERLEVEL9K_BATTERY_CHARGED"
|
||||||
|
|
Loading…
Reference in a new issue