Merge 31adb722075cb0e87e39506516ad1bc52320b218 into f853f1884a8f0c244765192dc6f5a910a7e2b8e5

This commit is contained in:
appeasementPolitik 2025-05-04 20:32:26 +00:00 committed by GitHub
commit 6ef4156dc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 86 additions and 22 deletions

View File

@ -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"

View File

@ -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%% *}"

View File

@ -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")"

View File

@ -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")"