Let the weather panel be pinned to a chosen location
The weather widgets asked wttr.in to geolocate by IP, which lands on
whatever city the ISP registers its address block under -- Downey when
you're in Malibu. Now the location can be set explicitly:
* Click the location in the weather panel to search via open-meteo
geocoding, pick a suggestion (disambiguated by region), and it sticks.
The X next to the field returns to IP auto-detect, as does committing
an empty search.
* State lives in ~/.local/state/omarchy/settings/weather.json as
{name, latitude, longitude}, owned by the new omarchy-weather-location
command (bare call prints the current location, --set/--clear write).
The panel watches the file, so hand edits apply live.
* Stored coordinates make wttr.in and open-meteo exact. Open-meteo also
now supplies current conditions alongside the daily forecast it
already served, which fills the panel within a second of a location
change instead of waiting out wttr.in's multi-second responses; wttr
results still win once they land. Failed wttr fetches retry instead
of sitting stale until the next refresh cycle.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
95c1ff0901
commit
5044e711a0
@@ -2,7 +2,16 @@
|
||||
|
||||
# omarchy:summary=Returns a weather condition icon, adjusted for live sunrise and sunset.
|
||||
|
||||
weather_data=$(curl -fsS --max-time 3 "https://wttr.in?format=j1" 2>/dev/null | jq -er '[.current_condition[0].weatherCode, .weather[0].astronomy[0].sunrise, .weather[0].astronomy[0].sunset] | select(all(. != null and . != "")) | @tsv' 2>/dev/null) || exit 1
|
||||
# Only consult the helper when a location is stored: this runs every minute,
|
||||
# and the helper's dynamic fallback would cost an extra wttr.in request when
|
||||
# nothing is set — the bare j1 fetch already auto-detects by IP.
|
||||
query=""
|
||||
if [[ -s "$HOME/.local/state/omarchy/settings/weather.json" ]]; then
|
||||
location=$(omarchy-weather-location 2>/dev/null)
|
||||
[[ -n $location ]] && query=$(jq -rn --arg location "$location" '$location | @uri')
|
||||
fi
|
||||
|
||||
weather_data=$(curl -fsS --max-time 3 "https://wttr.in/${query}?format=j1" 2>/dev/null | jq -er '[.current_condition[0].weatherCode, .weather[0].astronomy[0].sunrise, .weather[0].astronomy[0].sunset] | select(all(. != null and . != "")) | @tsv' 2>/dev/null) || exit 1
|
||||
|
||||
IFS=$'\t' read -r weather_code sunrise sunset <<< "$weather_data"
|
||||
if [[ ! $weather_code =~ ^[0-9]+$ || ! $sunrise =~ ^[0-9]{1,2}:[0-9]{2}\ [AP]M$ || ! $sunset =~ ^[0-9]{1,2}:[0-9]{2}\ [AP]M$ ]]; then
|
||||
|
||||
Reference in New Issue
Block a user