feat(weather): prefer structured wttr.in format, harden cache and icons

- Use wttr.in structured format first (%l, %C, %t) for stable 3-line parsing
- Fallback to individual field requests when combined output omits temperature
- Keep ASCII fallback as last resort; best-effort extraction of loc/cond/temp
- Read/write cache via mapfile to avoid word splitting; validate temp line
- Normalize condition string; extend mapping and add substring icon heuristics
- Remove accidental double JSON print in default-case; ensure single output

1 files changed, 176 insertions, 9 deletions

diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh
index 0540e51d..deba2d41 100755
--- a/config/hypr/UserScripts/Weather.sh
+++ b/config/hypr/UserScripts/Weather.sh
@@ -1,15 +1,182 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# weather info using Python script with Open-Meteo APIs
+# weather info from wttr. https://github.com/chubin/wttr.in
+# Remember to add city 
 
-if ! command -v python3 >/dev/null 2>&1; then
-    echo "python3 not found in PATH" >&2
-    exit 127
+city=""
+
+
+# if city is blank, use https://ipapi.co/json to get location from IP
+if [ -z "$city" ]; then
+    city=$(curl -fsS https://ipapi.co/json | grep city | cut -f4 -d'"')
+fi
+
+
+cachedir="$HOME/.cache/rbn"
+# Include city and arg in cache key so changing city invalidates old cache
+cache_key="${city}_${1}"
+# Sanitize cache key to avoid problematic characters in filename
+safe_key=$(printf '%s' "$cache_key" | tr -c '[:alnum:]_-' '_')
+cachefile=${0##*/}-$safe_key
+
+if [ ! -d $cachedir ]; then
+    mkdir -p $cachedir
+fi
+
+if [ ! -f $cachedir/$cachefile ]; then
+    touch $cachedir/$cachefile
+fi
+
+# Save current IFS
+SAVEIFS=$IFS
+# Change IFS to new line.
+IFS=$'\n'
+
+cacheage=$(($(date +%s) - $(stat -c '%Y' "$cachedir/$cachefile")))
+if [ $cacheage -gt 1740 ] || [ ! -s "$cachedir/$cachefile" ]; then
+    # Prefer structured format for reliable parsing (3 lines: location, condition, temperature)
+    mapfile -t sdata < <(curl -fsS "https://wttr.in/${city}?format=%25l%0A%25C%0A%25t&lang=en" 2>/dev/null || true)
+    if [ ${#sdata[@]} -ge 3 ]; then
+        printf "%s\n" "${sdata[0]}" > "$cachedir/$cachefile"
+        printf "%s\n" "${sdata[1]}" >> "$cachedir/$cachefile"
+        printf "%s\n" "${sdata[2]}" >> "$cachedir/$cachefile"
+    else
+        # Try fetching each field separately if combined format is flaky
+        loc=$(curl -fsS "https://wttr.in/${city}?format=%25l&lang=en" 2>/dev/null || true)
+        cond_only=$(curl -fsS "https://wttr.in/${city}?format=%25C&lang=en" 2>/dev/null || true)
+        temp_only=$(curl -fsS "https://wttr.in/${city}?format=%25t" 2>/dev/null || true)
+        if [ -n "$loc" ] && [ -n "$cond_only" ] && [ -n "$temp_only" ]; then
+            printf "%s\n" "$loc" > "$cachedir/$cachefile"
+            printf "%s\n" "$cond_only" >> "$cachedir/$cachefile"
+            printf "%s\n" "$temp_only" >> "$cachedir/$cachefile"
+        else
+        # Fallback: try ASCII output and extract best-effort fields
+        url="https://en.wttr.in/${city}?1"
+        mapfile -t data < <(curl -fsS "$url" 2>/dev/null || true)
+        if [ ${#data[@]} -ge 3 ] && ! echo "${data[0]}" | grep -qi 'not found\|unknown location'; then
+            loc=$(echo "${data[0]}" | sed -E 's/^.*: *//')
+            # Attempt to pull condition and temperature hints from nearby lines
+            cond=$(echo "${data[2]}" | sed -E 's/^.{0,15}//; s/^\s+//')
+            temp=$(printf "%s\n" "${data[@]}" | grep -Eo '\+?-?[0-9]+(\([^)]+\))? ?°?[CF]' | head -n1)
+            # Only write if we have at least location and something else meaningful
+            if [ -n "$loc" ] && { [ -n "$cond" ] || [ -n "$temp" ]; }; then
+                printf "%s\n" "$loc" > "$cachedir/$cachefile"
+                printf "%s\n" "${cond:-Unknown}" >> "$cachedir/$cachefile"
+                printf "%s\n" "${temp:-N/A}" >> "$cachedir/$cachefile"
+            fi
+        fi
+        fi
+    fi
+fi
+
+# Read cache robustly (line-wise)
+mapfile -t weather < "$cachedir/$cachefile"
+
+# If cache is still empty or invalid, emit a single error JSON and exit to avoid double-prints
+if [ ${#weather[@]} -lt 3 ] || ! echo "${weather[2]}" | grep -qE '[-+0-9].*°'; then
+    # Last-chance: try live structured fetch and populate cache and runtime weather
+    mapfile -t sdata < <(curl -fsS "https://wttr.in/${city}?format=%25l%0A%25C%0A%25t&lang=en" 2>/dev/null || true)
+    if [ ${#sdata[@]} -ge 3 ]; then
+        weather=("${sdata[@]}")
+        printf "%s\n" "${sdata[0]}" > "$cachedir/$cachefile"
+        printf "%s\n" "${sdata[1]}" >> "$cachedir/$cachefile"
+        printf "%s\n" "${sdata[2]}" >> "$cachedir/$cachefile"
+    else
+        loc=$(curl -fsS "https://wttr.in/${city}?format=%25l&lang=en" 2>/dev/null || true)
+        cond_only=$(curl -fsS "https://wttr.in/${city}?format=%25C&lang=en" 2>/dev/null || true)
+        temp_only=$(curl -fsS "https://wttr.in/${city}?format=%25t" 2>/dev/null || true)
+        if [ -n "$loc" ] && [ -n "$cond_only" ] && [ -n "$temp_only" ]; then
+            weather=("$loc" "$cond_only" "$temp_only")
+            printf "%s\n" "$loc" > "$cachedir/$cachefile"
+            printf "%s\n" "$cond_only" >> "$cachedir/$cachefile"
+            printf "%s\n" "$temp_only" >> "$cachedir/$cachefile"
+        else
+            echo -e "{\"text\":\"\uf06a\", \"alt\":\"\", \"tooltip\":\": \"}"
+            exit 1
+        fi
+    fi
+fi
+
+# Restore IFSClear
+IFS=$SAVEIFS
+
+temperature=$(echo "${weather[2]}" | sed -E 's/([[:digit:]]+)\.\./\1 to /g')
+
+#echo ${weather[1]##*,}
+
+# https://fontawesome.com/icons?s=solid&c=weather
+# Normalize condition string for matching
+cond_key=$(echo "${weather[1]##*,}" | tr '[:upper:]' '[:lower:]' | sed -E 's/^\s+//; s/\s+$//')
+case "$cond_key" in
+"clear" | "sunny")
+    condition=""
+    ;;
+"partly cloudy")
+    condition="󰖕"
+    ;;
+"cloudy")
+    condition=""
+    ;;
+"overcast")
+    condition=""
+    ;;
+"fog" | "freezing fog")
+    condition=""
+    ;;
+"patchy rain possible" | "patchy light drizzle" | "light drizzle" | "patchy light rain" | "light rain" | "light rain shower" | "mist" | "rain" | "patchy rain nearby")
+    condition="󰼳"
+    ;;
+"moderate rain at times" | "moderate rain" | "heavy rain at times" | "heavy rain" | "moderate or heavy rain shower" | "torrential rain shower" | "rain shower")
+    condition=""
+    ;;
+"patchy snow possible" | "patchy sleet possible" | "patchy freezing drizzle possible" | "freezing drizzle" | "heavy freezing drizzle" | "light freezing rain" | "moderate or heavy freezing rain" | "light sleet" | "ice pellets" | "light sleet showers" | "moderate or heavy sleet showers")
+    condition="󰼴"
+    ;;
+"blowing snow" | "moderate or heavy sleet" | "patchy light snow" | "light snow" | "light snow showers")
+    condition="󰙿"
+    ;;
+"blizzard" | "patchy moderate snow" | "moderate snow" | "patchy heavy snow" | "heavy snow" | "moderate or heavy snow with thunder" | "moderate or heavy snow showers")
+    condition=""
+    ;;
+"thundery outbreaks possible" | "patchy light rain with thunder" | "moderate or heavy rain with thunder" | "patchy light snow with thunder")
+    condition=""
+    ;;
+*)
+    condition=""
+    ;;
+esac
+
+# If still unknown, try substring heuristics to pick a reasonable icon
+if [ "$condition" = "" ]; then
+    if echo "$cond_key" | grep -q "rain\|drizzle\|shower"; then
+        condition="󰼳"
+    elif echo "$cond_key" | grep -q "heavy rain\|torrential"; then
+        condition=""
+    elif echo "$cond_key" | grep -q "snow"; then
+        condition="󰙿"
+    elif echo "$cond_key" | grep -q "sleet\|freezing\|ice"; then
+        condition="󰼴"
+    elif echo "$cond_key" | grep -q "thunder"; then
+        condition=""
+    elif echo "$cond_key" | grep -q "overcast"; then
+        condition=""
+    elif echo "$cond_key" | grep -q "cloud"; then
+        condition=""
+    elif echo "$cond_key" | grep -q "sunny\|clear"; then
+        condition=""
+    fi
 fi
 
-python3 "$(dirname "$0")/Weather.py" "$@"
-exit_code=$?
-if [ "$exit_code" -ne 0 ]; then
-    echo "Failed to run Weather.py" >&2
+#echo $temp $condition
+
+# Ensure temperature has a value; if empty, keep whatever is in weather[2] or N/A
+if [ -z "$temperature" ]; then
+    temperature="${weather[2]:-N/A}"
 fi
-exit "$exit_code"
\ No newline at end of file
+
+cond_disp=$(echo "${weather[1]}" | sed -E 's/^\s+//; s/\s+$//')
+echo -e "{\"text\":\""$temperature" "$condition"\", \"alt\":\""${weather[0]}"\", \"tooltip\":\""${weather[0]}: $temperature $cond_disp"\"}"
+
+cached_weather=" $temperature  \n$condition ${weather[1]}"
+
+echo -e $cached_weather >  "$HOME/.cache/.weather_cache"
\ No newline at end of file