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.

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

Jump to bottom

Make dwmblocks modules async #1296

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Make dwmblocks modules async #1296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d1054d8
Make dwmblocks modules async
appeasementPolitik Apr 2, 2023
060c093
Merge branch 'LukeSmithxyz:master' into async
appeasementPolitik Apr 4, 2023
0e23759
Allow dwmblocks signal numbers to be changed
appeasementPolitik Apr 4, 2023
e3a5d38
Become synchronous on manual run and make dwmblocks signal code optional
appeasementPolitik Apr 5, 2023
b1ddd95
Merge latest commits and add retries
appeasementPolitik Apr 20, 2023
fead6d6
Merge branch 'master' into async
appeasementPolitik Apr 20, 2023
b7dc644
Re-add fail-early to sb-price
appeasementPolitik Apr 23, 2023
de863bf
Make the retry logic better + other changes
appeasementPolitik Aug 16, 2023
36d40ad
Only redirect non-empty output: for when services are down
appeasementPolitik Aug 16, 2023
b0dbb1d
Also change modification time
appeasementPolitik Aug 18, 2023
92d3560
Robustness not needed anymore because of curl's --output, no more emp…
appeasementPolitik Aug 18, 2023
b5317fd
Merge branch 'master' into async
appeasementPolitik Oct 3, 2023
1500ec5
Use actual locks instead of pgrep
appeasementPolitik Oct 3, 2023
0afc70a
Change to more suitable lock file location for user programs
appeasementPolitik Nov 25, 2023
e3e7ef4
Implement thetubster's changes (fast retry and bug fixes)
appeasementPolitik Jul 23, 2024
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
4 changes: 1 addition & 3 deletions .local/bin/statusbar/sb-forecast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,4 @@ case $BLOCK_BUTTON in
6) "$TERMINAL" -e "$EDITOR" "$0" ;;
esac

checkforecast || getforecast

showweather
checkforecast && showweather || { ( getforecast && pkill -RTMIN+5 "${STATUSBAR:-dwmblocks}") & echo; }
appeasementPolitik marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 2 additions & 1 deletion .local/bin/statusbar/sb-iplocate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
# https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/

ifinstalled "geoip" || exit
addr="$(curl ifconfig.me 2>/dev/null)" || exit
ipfile="$XDG_RUNTIME_DIR/iplocate"
addr=$(cat "$ipfile") && rm "$ipfile" || { ( curl -s ifconfig.me > "$ipfile" && pkill -RTMIN+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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" || exit 1 ;}
{ ( curl -sf "wttr.in/?format=%m" > "$moonfile" && pkill -RTMIN+17 "${STATUSBAR:-dwmblocks}" ) & echo; exit; }

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

Expand Down
21 changes: 16 additions & 5 deletions .local/bin/statusbar/sb-price
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ filestat="$(stat -c %x "$pricefile" 2>/dev/null)"

[ -d "$dir" ] || mkdir -p "$dir"

updateprice() { curl -sf -m 1 --fail-early $currency.$url/{1$1,$1$interval} --output "$pricefile" --output "$chartfile" ||
updateprice() { curl -sf $currency.$url/{1$1,$1$interval} --output "$pricefile" --output "$chartfile" ||
rm -f "$pricefile" "$chartfile" ;}

[ "${filestat%% *}" != "$(date '+%Y-%m-%d')" ] &&
Expand All @@ -38,10 +38,21 @@ case $BLOCK_BUTTON in
esac

[ -n "$updateme" ] &&
updateprice "$1" &&
[ -n "$showupdate" ] &&
notify-send "$3 Update complete." "$2 price is now
\$$(cat "$pricefile")"
if [ -n "$showupdate" ]; then
updateprice "$1" && notify-send "$3 Update complete." "$2 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
fi

case "$currency" in
usd) symb="$" ;;
Expand Down