update

4 files changed, 134 insertions, 66 deletions

diff --git a/.local/bin/dmenuunicode b/.local/bin/dmenuunicode
index a9d94e9..bfb190d 100755
--- a/.local/bin/dmenuunicode
+++ b/.local/bin/dmenuunicode
@@ -3,7 +3,7 @@
 # The famous "get a menu of emojis to copy" script.
 
 # Get user selection via rofi -dmenu from emoji file.
-chosen=$(cut -d ';' -f1 ~/.local/share/larbs/chars/* | rofi -dmenu -i -l 30 | sed "s/ .*//")
+chosen=$(cut -d ';' -f1 ~/.local/share/extras/chars/* | rofi -dmenu -i -l 30 | sed "s/ .*//")
 
 # Exit if none chosen.
 [ -z "$chosen" ] && exit
diff --git a/.local/bin/statusbar/sb-forecast b/.local/bin/statusbar/sb-forecast
deleted file mode 100755
index eb07dfe..0000000
--- a/.local/bin/statusbar/sb-forecast
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# Displays today's precipication chance (☔), and daily low (🥶) and high (🌞).
-# Usually intended for the statusbar.
-
-url="${WTTRURL:-wttr.in}"
-weatherreport="${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport"
-
-# Get a weather report from 'wttr.in' and save it locally.
-getforecast() { { rg -q -m1 '^up$' /sys/class/net/w*/operstate || rg -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() {
-	[ "$(stat -c %y "$weatherreport" 2>/dev/null |
-		cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ]
-}
-
-getprecipchance() {
-	echo "$weatherdata" | sed '16q;d' |    # Extract line 16 from file
-		rg -wo "[0-9]*%" |           # Find a sequence of digits followed by '%'
-		sort -rn |                     # Sort in descending order
-		head -1q                       # Extract first line
-}
-
-getdailyhighlow() {
-	echo "$weatherdata" | sed '13q;d' |      # Extract line 13 from file
-		rg -o "m[-+]?[0-9]+" | # Find temperatures in the format "m<signed number>"
-		sed 's/[+m]//g' |                # Remove '+' and 'm'
-		sort -g |                        # Sort in ascending order
-		sed -e 1b -e '$!d'               # Extract the first and last lines
-}
-
-readfile() { weatherdata="$(bat "$weatherreport")" ;}
-
-showweather() {
-	readfile
-	# shellcheck disable=SC2046,SC2183
-	printf "☔%s ❄️%s° 🌞%s°\n" "$(getprecipchance)" $(getdailyhighlow)
-}
-
-case $BLOCK_BUTTON in
-	1) setsid -f "$TERMINAL" -e less -Sf "$weatherreport" >/dev/null 2>&1 ;;
-	2) getforecast && showweather ;;
-	3) notify-send "🌈 Weather module" "\- Left click for full forecast.
-- Middle click to update forecast.
-☔: Chance of rain/snow
-❄️: Daily low
-🌞: Daily high" ;;
-	8) setsid -f "$TERMINAL" -e "$EDITOR" "$0" >/dev/null 2>&1 ;;
-esac
-
-# 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+5 "${STATUSBAR:-waybar}"
-		) &
-	echo ) 9>"${XDG_RUNTIME_DIR}/sb-forecast.lock"
diff --git a/.local/bin/statusbar/sb-weather b/.local/bin/statusbar/sb-weather
new file mode 100755
index 0000000..d5fa97b
--- /dev/null
+++ b/.local/bin/statusbar/sb-weather
@@ -0,0 +1,85 @@
+#!/bin/sh
+arg=$1
+report=~/.cache/weather_report.json
+
+ifinstalled jq
+
+# Get a weather report from 'wttr.in' and save it locally.
+getforecast() { { rg -q -m1 '^up$' /sys/class/net/w*/operstate || rg -q -m1 '^up$' /sys/class/net/e*/operstate; } &&
+	curl -sf "wttr.in/?format=j1" --output "$report" && touch "$report"
+}
+
+# Forecast should be updated only once a day.
+checkforecast() {
+	[ "$(stat -c %y "$report" 2>/dev/null |
+		cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ]
+}
+
+# Function to get weather emoji from code
+get_weather_emoji() {
+    local code="$1"
+    grep "^$code " ~/.local/share/extras/weather_codes | awk '{print $2}'
+}
+
+showweather(){
+  temp=$(jq -r '.current_condition[0].temp_C' $report)
+  code=$(jq -r '.current_condition[0].weatherCode' $report)
+  rainchance=$(jq '.weather[].hourly[].chanceofrain | tonumber' $report | sort -n | tail -n 1)
+
+  emoji=$(get_weather_emoji "$code")
+  case "$arg" in
+    weather)
+      case 1 in
+        $((temp >= 30)) ) class="very_hot" ;;
+        $((temp >= 26)) ) class="hot" ;;
+        $((temp >= 21)) ) class="warm" ;;
+        $((temp >= 16)) ) class="mild" ;;
+        $((temp >= 11)) ) class="cool" ;;
+        $((temp >= 6)) ) class="chilly" ;;
+        $((temp >= 0)) ) class="cold" ;;
+        $((temp < 0)) ) class="below_zero" ;;
+        * ) echo unavailable && exit ;;
+      esac
+      output="$emoji$temp°C"
+      ;;
+    rain)
+      case 1 in
+        $((rainchance >= 90)) ) class="ninety" ;;
+        $((rainchance >= 70)) ) class="seventy" ;;
+        $((rainchance >= 50)) ) class="fifty" ;;
+        $((rainchance >= 30)) ) class="thirty" ;;
+        $((rainchance >= 10)) ) class="ten" ;;
+        $((rainchance > 0)) ) class="zero" ;;
+        $((rainchance <= 0)) ) printf '' && exit ;;
+        * ) echo unavailable && exit ;;
+      esac
+      output="$rainchance%"
+      ;;
+    *)
+      echo "Usage: $0 {weather|rain}"
+      exit 1
+      ;;
+  esac
+  printf '{"text": "%s", "class": "%s" }' "$output" "$class"
+}
+
+case $BLOCK_BUTTON in
+	2) getforecast && showweather ;;
+	3) notify-send "🌈 Weather module" "\- Middle click to update forecast.
+☔: Chance of rain/snow
+🌞: Current temperature" ;;
+	8) setsid -f "$TERMINAL" -e "$EDITOR" "$0" >/dev/null 2>&1 ;;
+esac
+
+# 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+5 "${STATUSBAR:-waybar}"
+		) &
+	echo ) 9>"${XDG_RUNTIME_DIR}/sb-forecast.lock"
diff --git a/.local/share/extras/weather_codes b/.local/share/extras/weather_codes
new file mode 100644
index 0000000..6a192eb
--- /dev/null
+++ b/.local/share/extras/weather_codes
@@ -0,0 +1,48 @@
+113 ☀️
+116 ⛅
+119 ☁️
+122 ☁️
+143 ☁️
+176 🌧️
+179 🌧️
+182 🌧️
+185 🌧️
+200 ⛈️
+227 🌨️
+230 🌨️
+248 ☁️
+260 ☁️
+263 🌧️
+266 🌧️
+281 🌧️
+284 🌧️
+293 🌧️
+296 🌧️
+299 🌧️
+302 🌧️
+305 🌧️
+308 🌧️
+311 🌧️
+314 🌧️
+317 🌧️
+320 🌨️
+323 🌨️
+326 🌨️
+329 ❄️
+332 ❄️
+335 ❄️
+338 ❄️
+350 🌧️
+353 🌧️
+356 🌧️
+359 🌧️
+362 🌧️
+365 🌧️
+368 🌧️
+371 ❄️
+374 🌨️
+377 🌨️
+386 🌨️
+389 🌨️
+392 🌧️
+395 ❄️