refactor: Change the method of parsing wmic output, improve performance.

pull/2726/head
Li Haoyuan 2 months ago
parent 39e1c51ae3
commit bc0f9341da

@ -1467,20 +1467,27 @@ _p9k_prompt_battery_set_args() {
;; ;;
Windows) Windows)
# See Win32_Battery class members at https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-battery local raw_data
battery_data=$(wmic path Win32_Battery get EstimatedChargeRemaining,BatteryStatus,EstimatedRunTime /format:list) local -a info_values
bat_percent=$(echo "$battery_data" | grep "EstimatedChargeRemaining" | awk -F'=' '{print $2}') # See definitions to Win32_Battery class members at https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-battery
bat_status=$(echo "$battery_data" | grep "BatteryStatus" | awk -F'=' '{print $2}') {
bat_remain_minutes=$(echo "$battery_data" | grep "EstimatedRunTime" | awk -F'=' '{print $2}') read -r 2>/dev/null
read -r raw_data
# Missing critical parameters } <<< "$(wmic path Win32_Battery get BatteryStatus,EstimatedChargeRemaining,EstimatedRunTime)"
if [[ -z "$bat_percent" || -z "$bat_status" || -z "$bat_remain_minutes" ]]; then
return 0 # info_values[1]: BatteryStatus
fi # info_values[2]: EstimatedChargeRemaining
# info_values[3]: EstimatedRunTime
info_values=(${(s: :)raw_data})
(( ${#info_values[@]} == 4 )) || return # Missing info_values (index [4] is for the following CRCR)
bat_percent=${info_values[2]}
local -i bat_remain_minutes=${info_values[3]}
case $bat_status in case ${info_values[1]} in
'1'|'4'|'5') '1'|'4'|'5')
# When the battery is charging, system will show that bat_remain_minutes is 71582788 (min) # When the battery is charging or full, system will show that bat_remain_minutes (EstimatedRunTime) is 71582788 (min)
(( bat_remain_minutes < 71582788 )) && remain=$((bat_remain_minutes/60)):${(l#2##0#)$((bat_remain_minutes%60))} || remain='' (( bat_remain_minutes < 71582788 )) && remain=$((bat_remain_minutes/60)):${(l#2##0#)$((bat_remain_minutes%60))} || remain=''
if (( bat_percent < _POWERLEVEL9K_BATTERY_LOW_THRESHOLD )); then if (( bat_percent < _POWERLEVEL9K_BATTERY_LOW_THRESHOLD )); then
state=LOW state=LOW

Loading…
Cancel
Save