1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Fix race conditions caused by writing to view

This commit is contained in:
Chris Cummer
2019-04-24 23:54:45 -07:00
parent b7be868798
commit a1aae6206f
13 changed files with 96 additions and 41 deletions

View File

@@ -12,6 +12,7 @@ import (
type Widget struct {
wtf.TextWidget
app *tview.Application
result string
settings *Settings
}
@@ -20,6 +21,7 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(app, settings.common, false),
app: app,
settings: settings,
}
@@ -29,7 +31,9 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
func (widget *Widget) Refresh() {
widget.prettyWeather()
widget.View.SetText(widget.result)
widget.app.QueueUpdateDraw(func() {
widget.View.SetText(widget.result)
})
}
//this method reads the config and calls wttr.in for pretty weather

View File

@@ -24,8 +24,10 @@ type Widget struct {
wtf.TextWidget
// APIKey string
Data []*owm.CurrentWeatherData
Idx int
Data []*owm.CurrentWeatherData
Idx int
app *tview.Application
settings *Settings
}
@@ -35,13 +37,12 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
Idx: 0,
Idx: 0,
app: app,
settings: settings,
}
// widget.loadAPICredentials()
// widget.APIKey
widget.HelpfulWidget.SetView(widget.View)
widget.View.SetInputCapture(widget.keyboardIntercept)
@@ -73,7 +74,9 @@ func (widget *Widget) Refresh() {
widget.Data = widget.Fetch(wtf.ToInts(widget.settings.cityIDs))
}
widget.display()
widget.app.QueueUpdateDraw(func() {
widget.display()
})
}
// Next displays data for the next city data in the list. If the current city is the last