Battery gauge requires a python script, 'battcharge.py' added to $ZSH/lib/ directory to work properly.
Cleaned up zshmarks again, now uses proper return codes in case bookmark not found, etc.
This commit is contained in:
Jocelyn Mallon 2011-10-08 13:06:09 -07:00
commit 59e2f43237
5 changed files with 78 additions and 16 deletions

38
lib/battcharge.py Executable file
View file

@ -0,0 +1,38 @@
#!/usr/bin/env python
# coding=UTF-8
import math, subprocess
p = subprocess.Popen(["ioreg", "-rc", "AppleSmartBattery"], stdout=subprocess.PIPE)
output = p.communicate()[0]
o_max = [l for l in output.splitlines() if 'MaxCapacity' in l][0]
o_cur = [l for l in output.splitlines() if 'CurrentCapacity' in l][0]
b_max = float(o_max.rpartition('=')[-1].strip())
b_cur = float(o_cur.rpartition('=')[-1].strip())
charge = b_cur / b_max
charge_threshold = int(math.ceil(10 * charge))
# Output
total_slots, slots = 10, []
filled = int(math.ceil(charge_threshold * (total_slots / 10.0))) * u''
empty = (total_slots - len(filled)) * u''
out = (filled + empty).encode('utf-8')
import sys
color_green = '%{%}'
color_yellow = '%{%}'
color_red = '%{%}'
color_reset = '%{%}'
color_out = (
color_green if len(filled) > 6
else color_yellow if len(filled) > 4
else color_red
)
out = color_out + out + color_reset
sys.stdout.write(out)

View file

@ -13,19 +13,21 @@ if [[ ! -f $bookmarks_file ]]; then
fi
function bookmark() {
bookmark_name=$1
if [[ -z $bookmark_name ]]; then
echo 'Invalid name, please provide a name for your bookmark. For example:'
echo ' bookmark foo'
else
bookmark="$(pwd)|$bookmark_name" # Store the bookmark as folder|name
if [[ -z $(grep "$bookmark" $bookmarks_file) ]]; then
echo $bookmark >> $bookmarks_file
echo "Bookmark '$bookmark_name' saved"
else
echo "Bookmark already existed"
fi
fi
bookmark_name=$1
if [[ -z $bookmark_name ]]; then
echo 'Invalid name, please provide a name for your bookmark. For example:'
echo ' bookmark foo'
return 1
else
bookmark="$(pwd)|$bookmark_name" # Store the bookmark as folder|name
if [[ -z $(grep "$bookmark" $bookmarks_file) ]]; then
echo $bookmark >> $bookmarks_file
echo "Bookmark '$bookmark_name' saved"
else
echo "Bookmark already existed"
return 1
fi
fi
}
function go() {
@ -37,6 +39,7 @@ function go() {
echo
echo "To bookmark a folder, go to the folder then do this (naming the bookmark 'foo'):"
echo " bookmark foo"
return 1
else
dir="${bookmark%%|*}"
cd "${dir}"

View file

@ -39,6 +39,11 @@ preexec () {
echo -en $reset_color
}
function battery_charge {
$ZSH/lib/battcharge.py
echo `$BAT_CHARGE` 2>/dev/null
}
setprompt () {
# Need this so the prompt will work.
setopt prompt_subst
@ -78,7 +83,7 @@ setprompt () {
PR_URCORNER=${altchar[k]:--}
# set return code to display if greater than zero
return_code="%(?..$PR_MAGENTA($PR_RED%? $PR_MAGENTA%))"
return_code="%(?..$PR_MAGENTA($PR_RED%? $PR_MAGENTA%))"
PROMPT='$PR_SET_CHARSET\
$PR_MAGENTA$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT(\
@ -95,6 +100,8 @@ $return_code\
$PR_MAGENTA$PR_SHIFT_IN$PR_HBAR\
$PR_GREEN$PR_SHIFT_OUT '
RPROMPT='$(battery_charge)$PR_GREEN'
PS2='$PR_MAGENTA$PR_SHIFT_IN$PR_LLCORNER$PR_HBAR$PR_HBAR$PR_SHIFT_OUT$PR_GREEN\ '
}

View file

@ -39,6 +39,11 @@ preexec () {
echo -en $reset_color
}
function battery_charge {
$ZSH/lib/battcharge.py
echo `$BAT_CHARGE` 2>/dev/null
}
setprompt () {
# Need this so the prompt will work.
setopt prompt_subst
@ -78,7 +83,7 @@ setprompt () {
PR_URCORNER=${altchar[k]:--}
# set return code to display if greater than zero
return_code="%(?..$PR_WHITE($PR_RED%? $PR_WHITE%))"
return_code="%(?..$PR_WHITE($PR_RED%? $PR_WHITE%))"
PROMPT='$PR_SET_CHARSET\
$PR_WHITE$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT(\
@ -95,6 +100,8 @@ $return_code\
$PR_WHITE$PR_SHIFT_IN$PR_HBAR\
$PR_GREEN$PR_SHIFT_OUT '
RPROMPT='$(battery_charge)$PR_GREEN'
PS2='$PR_MAGENTA$PR_SHIFT_IN$PR_LLCORNER$PR_HBAR$PR_HBAR$PR_SHIFT_OUT$PR_GREEN\ '
}

View file

@ -39,6 +39,11 @@ preexec () {
echo -en $reset_color
}
function battery_charge {
$ZSH/lib/battcharge.py
echo `$BAT_CHARGE` 2>/dev/null
}
setprompt () {
# Need this so the prompt will work.
setopt prompt_subst
@ -78,7 +83,7 @@ setprompt () {
PR_URCORNER=${altchar[k]:--}
# set return code to display if greater than zero
return_code="%(?..$PR_BLUE($PR_RED%? $PR_BLUE%))"
return_code="%(?..$PR_BLUE($PR_RED%? $PR_BLUE%))"
PROMPT='$PR_SET_CHARSET\
$PR_BLUE$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT(\
@ -95,6 +100,8 @@ $return_code\
$PR_BLUE$PR_SHIFT_IN$PR_HBAR\
$PR_GREEN$PR_SHIFT_OUT '
RPROMPT='$(battery_charge)$PR_GREEN'
PS2='$PR_MAGENTA$PR_SHIFT_IN$PR_LLCORNER$PR_HBAR$PR_HBAR$PR_SHIFT_OUT$PR_GREEN\ '
}