extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-01-08 23:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix weather widget making HTTP request as part of validation

Browse Source 
Which would prevent app startup if there was no internet connection
This commit is contained in:
Svilen Markov 2024-05-28 17:45:02 +01:00
parent 2af6500028
commit d2f5dbbc26
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/widget/weather.go
View File

@ -27,6 +27,10 @@ var timeLabels24h = [12]string{"02:00", "04:00", "06:00", "08:00", "10:00", "12:
func (widget *Weather) Initialize() error { func (widget *Weather) Initialize() error {
widget.withTitle("Weather").withCacheOnTheHour() widget.withTitle("Weather").withCacheOnTheHour()
if widget.Location == "" {
return fmt.Errorf("location must be specified for weather widget")
}
if widget.HourFormat == "" || widget.HourFormat == "12h" { if widget.HourFormat == "" || widget.HourFormat == "12h" {
widget.TimeLabels = timeLabels12h widget.TimeLabels = timeLabels12h
} else if widget.HourFormat == "24h" { } else if widget.HourFormat == "24h" {
@ -41,18 +45,21 @@ func (widget *Weather) Initialize() error {
return fmt.Errorf("invalid units '%s' for weather, must be either metric or imperial", widget.Units) return fmt.Errorf("invalid units '%s' for weather, must be either metric or imperial", widget.Units)
} }
place, err := feed.FetchPlaceFromName(widget.Location)
if err != nil {
return fmt.Errorf("failed fetching data for %s: %v", widget.Location, err)
}
widget.Place = place
return nil return nil
} }
func (widget *Weather) Update(ctx context.Context) { func (widget *Weather) Update(ctx context.Context) {
if widget.Place == nil {
place, err := feed.FetchPlaceFromName(widget.Location)
if err != nil {
widget.withError(err).scheduleEarlyUpdate()
return
}
widget.Place = place
}
weather, err := feed.FetchWeatherForPlace(widget.Place, widget.Units) weather, err := feed.FetchWeatherForPlace(widget.Place, widget.Units)
if !widget.canContinueUpdateAfterHandlingErr(err) { if !widget.canContinueUpdateAfterHandlingErr(err) {