Skip to content
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.

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

Make dwmblocks modules async #1296

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Allow dwmblocks signal numbers to be changed
appeasementPolitik authored Apr 4, 2023
commit 0e237592d74fb9b505231bbb4bd2649da0aab8ea
2 changes: 1 addition & 1 deletion .local/bin/statusbar/sb-forecast
Original file line number Diff line number Diff line change
@@ -48,4 +48,4 @@ case $BLOCK_BUTTON in
6) "$TERMINAL" -e "$EDITOR" "$0" ;;
esac

checkforecast && showweather || { ( getforecast && pkill -RTMIN+5 "${STATUSBAR:-dwmblocks}") & echo; }
checkforecast && showweather || { ( getforecast && pkill -RTMIN+"${1:-5}" "${STATUSBAR:-dwmblocks}") & echo; }
2 changes: 1 addition & 1 deletion .local/bin/statusbar/sb-iplocate
Original file line number Diff line number Diff line change
@@ -7,5 +7,5 @@

ifinstalled "geoip" || exit
ipfile="$XDG_RUNTIME_DIR/iplocate"
addr=$(cat "$ipfile") && rm "$ipfile" || { ( curl -s ifconfig.me > "$ipfile" && pkill -RTMIN+27 "${STATUSBAR:-dwmblocks}") & echo; exit; }
addr=$(cat "$ipfile") && rm "$ipfile" || { ( curl -s ifconfig.me > "$ipfile" && pkill -RTMIN+"${1:-27}" "${STATUSBAR:-dwmblocks}") & echo; exit; }
grep "flag: " "${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji" | grep "$(geoiplookup "$addr" | sed 's/.*, //')" | sed "s/flag: //;s/;.*//"
2 changes: 1 addition & 1 deletion .local/bin/statusbar/sb-moonphase
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
moonfile="${XDG_DATA_HOME:-$HOME/.local/share}/moonphase"

[ -s "$moonfile" ] && [ "$(stat -c %y "$moonfile" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] ||
{ ( curl -sf "wttr.in/?format=%m" > "$moonfile" && pkill -RTMIN+17 "${STATUSBAR:-dwmblocks}" ) & echo; exit; }
{ ( curl -sf "wttr.in/?format=%m" > "$moonfile" && pkill -RTMIN+"${1:-17}" "${STATUSBAR:-dwmblocks}" ) & echo; exit; }

icon="$(cat "$moonfile")"

34 changes: 12 additions & 22 deletions .local/bin/statusbar/sb-price
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/sh

# Usage:
# price <url> <Name of currency> <icon> <Price to show in>
# price bat "Basic Attention Token" 🦁
# price <dwmblocks signal> <url> <Name of currency> <icon> <Price to show in>
# price 20 bat "Basic Attention Token" 🦁
# When the name of the currency is multi-word, put it in quotes.

[ -z "$3" ] && exit 1
[ -z "$4" ] && exit 1

# use $4 as currency, if not passed in use "usd" as default
# use $5 as currency, if not passed in use "usd" as default
url="${CRYPTOURL:-rate.sx}"
currency="${4:-usd}"
currency="${5:-usd}"
interval="@14d" # History contained in chart preceded by '@' (7d = 7 days)
dir="${XDG_CACHE_HOME:-$HOME/.cache}/crypto-prices"
pricefile="$dir/$1-$currency"
chartfile="$dir/$1-$currency-chart"
pricefile="$dir/$2-$currency"
chartfile="$dir/$2-$currency-chart"
filestat="$(stat -c %x "$pricefile" 2>/dev/null)"

[ -d "$dir" ] || mkdir -p "$dir"
@@ -26,9 +26,9 @@ updateprice() { curl -sf $currency.$url/{1$1,$1$interval} --output "$pricefile"

case $BLOCK_BUTTON in
1) setsid "$TERMINAL" -e less -Srf "$chartfile" ;;
2) notify-send -u low "$3 Updating..." "Updating $2 price..." ; updateme="1" ; showupdate="1" ;;
2) notify-send -u low "$4 Updating..." "Updating $3 price..." ; updateme="1" ; showupdate="1" ;;
3) uptime="$(date -d "$filestat" '+%D at %T' | sed "s|$(date '+%D')|Today|")"
notify-send "$3 $2 module" "\- <b>Exact price: \$$(cat "$pricefile")</b>
notify-send "$4 $3 module" "\- <b>Exact price: \$$(cat "$pricefile")</b>
- Left click for chart of changes.
- Middle click to update.
- Shows 🔃 if updating prices.
@@ -39,19 +39,9 @@ esac

[ -n "$updateme" ] &&
if [ -n "$showupdate" ]; then
updateprice "$1" && notify-send "$3 Update complete." "$2 price is now \$$(cat "$pricefile")"
updateprice "$2" && notify-send "$4 Update complete." "$3 price is now \$$(cat "$pricefile")"
else
# get dwmblocks signal numbers corresponding to currency
case "$1" in
lbc) sig="22" ;;
bat) sig="20" ;;
link) sig="25" ;;
xmr) sig="24" ;;
eth) sig="23" ;;
btc) sig="21" ;;
esac

( updateprice "$1" && pkill -RTMIN+"$sig" "${STATUSBAR:-dwmblocks}") & echo; exit
( updateprice "$2" && pkill -RTMIN+"$1" "${STATUSBAR:-dwmblocks}") & echo; exit
fi

case "$currency" in
@@ -61,4 +51,4 @@ case "$currency" in
btc) symb="" ;;
esac

[ -f "$pricefile" ] && printf "$3$symb%0.2f" "$(cat "$pricefile")"
[ -f "$pricefile" ] && printf "$4$symb%0.2f" "$(cat "$pricefile")"