summaryrefslogtreecommitdiffstats
path: root/.local/bin/statusbar
diff options
context:
space:
mode:
authorappeasementPolitik <108810900+appeasementPolitik@users.noreply.github.com>2026-06-30 03:52:33 +0000
committerGitHub <noreply@github.com>2026-06-29 23:52:33 -0400
commit0e8bd85602cbe3f894d0cf5b0ce8af5cda40fd66 (patch)
tree4ab852fa1a3d8e0c79e85e345b88ed6333a5c155 /.local/bin/statusbar
parentf82018293b3619485787075023ab4e9af2fd0f58 (diff)
downloadeibhear-0e8bd85602cbe3f894d0cf5b0ce8af5cda40fd66.tar.gz
eibhear-0e8bd85602cbe3f894d0cf5b0ce8af5cda40fd66.tar.zst
eibhear-0e8bd85602cbe3f894d0cf5b0ce8af5cda40fd66.zip
Make dwmblocks modules async (#1296)
* Make dwmblocks modules async * Allow dwmblocks signal numbers to be changed * Become synchronous on manual run and make dwmblocks signal code optional * Merge latest commits and add retries * Re-add fail-early to sb-price * Make the retry logic better + other changes * Only redirect non-empty output: for when services are down * Also change modification time * Robustness not needed anymore because of curl's --output, no more empty files * Use actual locks instead of pgrep * Change to more suitable lock file location for user programs * Implement thetubster's changes (fast retry and bug fixes)
Diffstat (limited to '.local/bin/statusbar')
-rwxr-xr-x.local/bin/statusbar/sb-forecast22
-rwxr-xr-x.local/bin/statusbar/sb-iplocate21
-rwxr-xr-x.local/bin/statusbar/sb-moonphase23
-rwxr-xr-x.local/bin/statusbar/sb-price42
4 files changed, 86 insertions, 22 deletions
diff --git a/.local/bin/statusbar/sb-forecast b/.local/bin/statusbar/sb-forecast
index 5225601..645e7a2 100755
--- a/.local/bin/statusbar/sb-forecast
+++ b/.local/bin/statusbar/sb-forecast
@@ -7,11 +7,13 @@ url="${WTTRURL:-wttr.in}"
weatherreport="${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport"
# Get a weather report from 'wttr.in' and save it locally.
-getforecast() { timeout --signal=1 2s curl -sf "$url/$LOCATION" > "$weatherreport" || exit 1; }
+getforecast() { { grep -q -m1 '^up$' /sys/class/net/w*/operstate || grep -q -m1 '^up$' /sys/class/net/e*/operstate; } &&
+ curl -sf "$url/$LOCATION" --output "$weatherreport" && touch "$weatherreport"
+}
# Forecast should be updated only once a day.
checkforecast() {
- [ -s "$weatherreport" ] && [ "$(stat -c %y "$weatherreport" 2>/dev/null |
+ [ "$(stat -c %y "$weatherreport" 2>/dev/null |
cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ]
}
@@ -34,6 +36,7 @@ readfile() { weatherdata="$(cat "$weatherreport")" ;}
showweather() {
readfile
+ # shellcheck disable=SC2046,SC2183
printf "☔%s 🥶%s° 🌞%s°\n" "$(getprecipchance)" $(getdailyhighlow)
}
@@ -48,6 +51,15 @@ case $BLOCK_BUTTON in
6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
esac
-checkforecast || getforecast
-
-showweather
+# shellcheck disable=SC2015
+checkforecast && showweather ||
+ ( flock -n 9 &&
+ ( tries=0; while [ $tries -ne 100 ]; do
+ getforecast && break ||
+ { tries=$((tries+1)); sleep .1; }
+ done
+ ! checkforecast &&
+ until getforecast; do sleep 60; done
+ pkill -RTMIN+"${1:-5}" "${STATUSBAR:-dwmblocks}"
+ ) &
+ echo ) 9>"${XDG_RUNTIME_DIR}/sb-forecast.lock"
diff --git a/.local/bin/statusbar/sb-iplocate b/.local/bin/statusbar/sb-iplocate
index a9043e3..a1606e1 100755
--- a/.local/bin/statusbar/sb-iplocate
+++ b/.local/bin/statusbar/sb-iplocate
@@ -5,10 +5,25 @@
#
# https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/
-set -e
+ifinstalled "geoip" || exit 1
-ifinstalled "geoip"
-addr="$(geoiplookup "$(curl -sfm 1 ifconfig.me 2>/dev/null)")"
+getip() {
+ { grep -q -m1 '^up$' /sys/class/net/w*/operstate || grep -q -m1 '^up$' /sys/class/net/e*/operstate; } &&
+ curl -sf api.ipify.org --output "$ipfile"
+}
+
+ipfile="$XDG_RUNTIME_DIR/iplocate"
+addr=$(cat "$ipfile" 2>/dev/null) && addr=$(geoiplookup "$addr" 2>/dev/null) && rm "$ipfile" ||
+ ( flock -n 9 &&
+ ( tries=0; while [ $tries -ne 100 ]; do
+ getip && break ||
+ { tries=$((tries+1)); sleep .1; }
+ done
+ ! [ -f "$ipfile" ] &&
+ until getip; do sleep 60; done &&
+ pkill -RTMIN+"${1:-27}" "${STATUSBAR:-dwmblocks}"
+ ) &
+ echo; exit ) 9>"${XDG_RUNTIME_DIR}/sb-iplocate.lock"
name="${addr##*, }"
flag="$(grep "flag: $name" "${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji")"
flag="${flag%% *}"
diff --git a/.local/bin/statusbar/sb-moonphase b/.local/bin/statusbar/sb-moonphase
index d496ae2..145c1b7 100755
--- a/.local/bin/statusbar/sb-moonphase
+++ b/.local/bin/statusbar/sb-moonphase
@@ -4,8 +4,27 @@
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 ;}
+checkmoon() {
+ [ "$(stat -c %y "$moonfile" 2>/dev/null |
+ cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ]
+}
+
+getmoon() { { grep -q -m1 '^up$' /sys/class/net/w*/operstate || grep -q -m1 '^up$' /sys/class/net/e*/operstate; } &&
+ curl -sf "wttr.in/?format=%m" --output "$moonfile" && touch "$moonfile"
+}
+
+checkmoon ||
+ ( flock -n 9 &&
+ ( tries=0; while [ $tries -ne 100 ]; do
+ # shellcheck disable=SC2015
+ getmoon && break ||
+ { tries=$((tries+1)); sleep .1; }
+ done
+ ! checkmoon &&
+ until getmoon; do sleep 60; done
+ pkill -RTMIN+"${1:-17}" "${STATUSBAR:-dwmblocks}"
+ ) &
+ echo; exit ) 9>"${XDG_RUNTIME_DIR}/sb-moonphase.lock"
icon="$(cat "$moonfile")"
diff --git a/.local/bin/statusbar/sb-price b/.local/bin/statusbar/sb-price
index 6a79f8a..68f5146 100755
--- a/.local/bin/statusbar/sb-price
+++ b/.local/bin/statusbar/sb-price
@@ -24,22 +24,27 @@ interval="@14d" # History contained in chart preceded by '@' (7d = 7 days)
dir="${XDG_CACHE_HOME:-$HOME/.cache}/crypto-prices"
pricefile="$dir/$target-$denom"
chartfile="$dir/$target-$denom-chart"
-filestat="$(stat -c %x "$pricefile" 2>/dev/null)"
[ -d "$dir" ] || mkdir -p "$dir"
-updateprice() { curl -sf \
- --fail-early "${denom}.${url}/1${target}" "${denom}.${url}/${target}${interval}" \
- --output "$pricefile" --output "$chartfile" ||
- rm -f "$pricefile" "$chartfile" ;}
+checkprice() {
+ [ "$(stat -c %y "$pricefile" 2>/dev/null |
+ cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ]
+}
-[ "${filestat%% *}" != "$(date '+%Y-%m-%d')" ] &&
- updateme="1"
+updateprice() { { grep -q -m1 '^up$' /sys/class/net/w*/operstate || grep -q -m1 '^up$' /sys/class/net/e*/operstate; } &&
+ curl -sf \
+ --fail-early "${denom}.${url}/1${target}" "${denom}.${url}/${target}${interval}" \
+ --output "$pricefile" --output "$chartfile" &&
+ touch "$pricefile" "$chartfile"
+}
+
+checkprice || updateme="1"
case $BLOCK_BUTTON in
1) setsid "$TERMINAL" -e less -Srf "$chartfile" ;;
2) notify-send -u low "$icon Updating..." "Updating $name price..." ; updateme="1" ; showupdate="1" ;;
- 3) uptime="$(date -d "$filestat" '+%D at %T' | sed "s|$(date '+%D')|Today|")"
+ 3) uptime="$(date -d "$(stat -c %x "$pricefile" 2>/dev/null)" '+%D at %T' | sed "s|$(date '+%D')|Today|")"
notify-send "$icon $name module" "\- <b>Exact price: \$$(cat "$pricefile")</b>
- Left click for chart of changes.
- Middle click to update.
@@ -50,9 +55,22 @@ case $BLOCK_BUTTON in
esac
[ -n "$updateme" ] &&
- updateprice "$target" &&
- [ -n "$showupdate" ] &&
- notify-send "$icon Update complete." "$name price is now
-\$$(cat "$pricefile")"
+ if [ -n "$showupdate" ]; then
+ updateprice && notify-send "$icon Update complete." "$name price is now \$$(cat "$pricefile")"
+ else
+ # shellcheck disable=SC2015
+ [ -n "$4" ] &&
+ ( flock -n 9 &&
+ ( tries=0; while [ $tries -ne 100 ]; do
+ updateprice && break ||
+ { tries=$((tries+1)); sleep .1; }
+ done
+ ! checkprice &&
+ until updateprice; do sleep 60; done
+ pkill -RTMIN+"$4" "${STATUSBAR:-dwmblocks}"
+ ) &
+ echo; exit ) 9>"${XDG_RUNTIME_DIR}/sb-price.lock" ||
+ updateprice
+ fi
[ -f "$pricefile" ] && printf "%s%s%0.2f" "$icon" "$symb" "$(cat "$pricefile")"