Skip to content

Add vbattery and hbattery prompt items #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jose1711 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add vbattery and hbattery prompt items #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions functions/_tide_item_hbattery.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
function _tide_item_hbattery
switch $tide_battery_method
case termux
set -l termux_bat_out (termux-battery-status)
set -f bat_capacity (string match -rg 'percentage": ([0-9]*)' $termux_bat_out)
set -f bat_status (string match -rg '"status": "([^"]*)"' $termux_bat_out)
case sysfs
if set -q tide_battery_sysfs_name
set -f bat_capacity (cat /sys/class/power_supply/$tide_battery_sysfs_name/capacity)
set -f bat_status (cat /sys/class/power_supply/$tide_battery_sysfs_name/status)
else
set -l battery_name /sys/class/power_supply/BAT*
if count $battery_name >/dev/null
set -f bat_capacity (cat $battery_name/capacity)[1]
set -f bat_status (cat $battery_name/status)[1]
end
end
case '*'
set -l upower_out (upower -b)
set -f bat_capacity (string match -rg 'percentage: *([0-9]*)' $upower_out)
set -f bat_status (string match -rg 'state: *(.*)' $upower_out)
end

test -n "$bat_capacity" || return

# 0-19 20-39 40-59 60-79 80-99 100
set -f battery_symbols '' '' '' '' '' ''

switch (string lower $bat_status)
case 'not charging' 'fully charged' fully-charged
_tide_print_item hbattery ''
return
case discharging
if test $bat_capacity -lt $tide_battery_critical_threshold
set -fx tide_battery_color $tide_battery_color_critical
else if test $bat_capacity -lt $tide_battery_low_threshold
set -fx tide_battery_color $tide_battery_color_low
end
end

set -l symbol_index (math -s0 "$bat_capacity / 20 + 1")
set -l battery_symbol $battery_symbols[$symbol_index]

if string match charging (string lower $bat_status) -q
_tide_print_item hbattery "$battery_symbol 󰉁"
else
_tide_print_item hbattery $battery_symbol
end
end
49 changes: 49 additions & 0 deletions functions/_tide_item_vbattery.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
function _tide_item_vbattery
switch $tide_battery_method
case termux
set -l termux_bat_out (termux-battery-status)
set -f bat_capacity (string match -rg 'percentage": ([0-9]*)' $termux_bat_out)
set -f bat_status (string match -rg '"status": "([^"]*)"' $termux_bat_out)
case sysfs
if set -q tide_battery_sysfs_name
set -f bat_capacity (cat /sys/class/power_supply/$tide_battery_sysfs_name/capacity)
set -f bat_status (cat /sys/class/power_supply/$tide_battery_sysfs_name/status)
else
set -l battery_name /sys/class/power_supply/BAT*
if count $battery_name >/dev/null
set -f bat_capacity (cat $battery_name/capacity)[1]
set -f bat_status (cat $battery_name/status)[1]
end
end
case '*'
set -l upower_out (upower -b)
set -f bat_capacity (string match -rg 'percentage: *([0-9]*)' $upower_out)
set -f bat_status (string match -rg 'state: *(.*)' $upower_out)
end

test -n "$bat_capacity" || return

switch (string lower $bat_status)
case 'not charging' 'fully charged'
_tide_print_item vbattery '󰁹'
return
case charging
# 0-4 5-14 15-24 25-34 35-44 45-54 55-64 65-74 75-84 85-94 95-100
set -f battery_symbols '󰢟' '󰢜' '󰂆' '󰂇' '󰂈' '󰢝' '󰂉' '󰢞' '󰂊' '󰂋' '󰂅'
case discharging
set -f battery_symbols '󰂎' '󰁺' '󰁻' '󰁼' '󰁽' '󰁾' '󰁿' '󰂀' '󰂁' '󰂂' '󰁹'
if test $bat_capacity -lt $tide_battery_critical_threshold
set -fx tide_battery_color $tide_battery_color_critical
else if test $bat_capacity -lt $tide_battery_low_threshold
set -fx tide_battery_color $tide_battery_color_low
end
case '*'
_tide_print_item vbattery '󰂑'
return
end

set -l symbol_index (math -s0 -m round "$bat_capacity / 10 + 1")
set -l battery_symbol $battery_symbols[$symbol_index]

_tide_print_item vbattery $battery_symbol
end
9 changes: 9 additions & 0 deletions functions/tide/configure/configs/classic.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
tide_aws_bg_color 444444
tide_aws_color FF9900
tide_battery_color_critical D70000
tide_battery_color_low C4A000
tide_battery_critical_threshold 15
tide_battery_low_threshold 40
tide_battery_method
tide_hbattery_bg_color 444444
tide_hbattery_color FFFFFF
tide_vbattery_bg_color 444444
tide_vbattery_color FFFFFF
tide_bun_bg_color 14151A
tide_bun_color FBF0DF
tide_character_color $_tide_color_green
Expand Down
9 changes: 9 additions & 0 deletions functions/tide/configure/configs/classic_16color.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
tide_aws_bg_color black
tide_aws_color yellow
tide_battery_color_critical brred
tide_battery_color_low bryellow
tide_battery_critical_threshold 15
tide_battery_low_threshold 40
tide_battery_method
tide_hbattery_bg_color black
tide_hbattery_color normal
tide_vbattery_bg_color black
tide_vbattery_color normal
tide_bun_bg_color black
tide_bun_color white
tide_character_color brgreen
Expand Down
9 changes: 9 additions & 0 deletions functions/tide/configure/configs/lean.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
tide_aws_bg_color normal
tide_aws_color FF9900
tide_battery_color_critical D70000
tide_battery_color_low C4A000
tide_battery_critical_threshold 15
tide_battery_low_threshold 40
tide_battery_method
tide_hbattery_bg_color normal
tide_hbattery_color normal
tide_vbattery_bg_color normal
tide_vbattery_color normal
tide_bun_bg_color normal
tide_bun_color FBF0DF
tide_character_color $_tide_color_green
Expand Down
9 changes: 9 additions & 0 deletions functions/tide/configure/configs/lean_16color.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
tide_aws_bg_color normal
tide_aws_color yellow
tide_battery_color_critical brred
tide_battery_color_low bryellow
tide_battery_critical_threshold 15
tide_battery_low_threshold 40
tide_battery_method
tide_hbattery_bg_color normal
tide_hbattery_color normal
tide_vbattery_bg_color normal
tide_vbattery_color normal
tide_bun_bg_color normal
tide_bun_color white
tide_character_color brgreen
Expand Down
9 changes: 9 additions & 0 deletions functions/tide/configure/configs/rainbow.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
tide_aws_bg_color FF9900
tide_aws_color 232F3E
tide_battery_color_critical D70000
tide_battery_color_low C4A000
tide_battery_critical_threshold 15
tide_battery_low_threshold 40
tide_battery_method
tide_hbattery_bg_color 444444
tide_hbattery_color FFFFFF
tide_vbattery_bg_color 444444
tide_vbattery_color FFFFFF
tide_bun_bg_color FBF0DF
tide_bun_color 14151A
tide_character_color $_tide_color_green
Expand Down
9 changes: 9 additions & 0 deletions functions/tide/configure/configs/rainbow_16color.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
tide_aws_bg_color yellow
tide_aws_color brblack
tide_battery_color_critical brred
tide_battery_color_low bryellow
tide_battery_critical_threshold 15
tide_battery_low_threshold 40
tide_battery_method
tide_hbattery_bg_color brblack
tide_hbattery_color white
tide_vbattery_bg_color brblack
tide_vbattery_color white
tide_bun_bg_color white
tide_bun_color black
tide_character_color brgreen
Expand Down
143 changes: 143 additions & 0 deletions tests/_tide_item_battery.test.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
# RUN: %fish %s
source (status dirname)/../functions/_tide_parent_dirs.fish
source (status dirname)/../functions/_tide_print_item.fish
source (status dirname)/../functions/_tide_item_vbattery.fish
source (status dirname)/../functions/_tide_item_hbattery.fish

function _tide_decolor
string replace --all -r '\e(\[[\d;]*|\(B\e\[)m(\co)?' '' "$argv"
end

set -g _tide_side right
set -g _tide_pad ''
set -g tide_right_prompt_separator_diff_color ''
set -g tide_right_prompt_separator_same_color ''
set -g tide_right_prompt_prefix ''

_tide_parent_dirs

set -lx tide_battery_color_critical red
set -lx tide_battery_color_low yellow
set -lx tide_battery_critical_threshold 15
set -lx tide_battery_low_threshold 40
set -lx tide_battery_method ''

# ── vbattery ──────────────────────────────────────────────────────────────────

function _vbattery
_tide_decolor (_tide_item_vbattery)
end

set -lx tide_vbattery_bg_color normal
set -lx tide_vbattery_color normal

function upower
echo 'No battery found'
end
_vbattery # CHECK:

function upower
echo 'percentage: 50'
echo 'state: discharging'
end
_vbattery # CHECK: 󰁾

function upower
echo 'percentage: 20'
echo 'state: discharging'
end
_vbattery # CHECK: 󰁻

function upower
echo 'percentage: 10'
echo 'state: discharging'
end
_vbattery # CHECK: 󰁺

function upower
echo 'percentage: 50'
echo 'state: charging'
end
_vbattery # CHECK: 󰢝

function upower
echo 'percentage: 100'
echo 'state: fully charged'
end
_vbattery # CHECK: 󰁹

function upower
echo 'percentage: 100'
echo 'state: not charging'
end
_vbattery # CHECK: 󰁹

function upower
echo 'percentage: 50'
echo 'state: unknown'
end
_vbattery # CHECK: 󰂑

set -lx tide_battery_method termux
function termux-battery-status
echo '{"percentage": 75, "status": "CHARGING"}'
end
_vbattery # CHECK: 󰂊

# ── hbattery ──────────────────────────────────────────────────────────────────

set -lx tide_battery_method ''

function _hbattery
_tide_decolor (_tide_item_hbattery)
end

set -lx tide_hbattery_bg_color normal
set -lx tide_hbattery_color normal

function upower
echo 'No battery found'
end
_hbattery # CHECK:

function upower
echo 'percentage: 10'
echo 'state: discharging'
end
_hbattery # CHECK: 

function upower
echo 'percentage: 30'
echo 'state: discharging'
end
_hbattery # CHECK: 

function upower
echo 'percentage: 60'
echo 'state: discharging'
end
_hbattery # CHECK: 

function upower
echo 'percentage: 80'
echo 'state: charging'
end
_hbattery # CHECK:  󰉁

function upower
echo 'percentage: 80'
echo 'state: discharging'
end
_hbattery # CHECK: 

function upower
echo 'percentage: 100'
echo 'state: fully charged'
end
_hbattery # CHECK: 

function upower
echo 'percentage: 100'
echo 'state: not charging'
end
_hbattery # CHECK: 