taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

WTF-315 Fix race conditions caused by writing to view

Browse Source
This commit is contained in:
Chris Cummer
2019-04-24 23:53:31 -07:00
parent a1aae6206f
commit 5445309aa0
33 changed files with 256 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/cmdrunner/widget.go
View File

@@ -15,10 +15,10 @@ type Widget struct {
app *tview.Application
args []string
cmd string
result string
settings *Settings
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(app, settings.common, false),
@@ -34,17 +34,20 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
return &widget
}
// Refresh executes the command and updates the view with the results
func (widget *Widget) Refresh() {
widget.execute()
result := widget.execute()
widget.CommonSettings.Title = widget.String()
ansiTitle := tview.TranslateANSI(widget.String())
ansiResult := tview.TranslateANSI(result)
widget.app.QueueUpdateDraw(func() {
widget.View.SetTitle(tview.TranslateANSI(widget.CommonSettings.Title))
widget.View.SetText(widget.result)
widget.View.SetTitle(ansiTitle)
widget.View.SetText(ansiResult)
})
}
// String returns the string representation of the widget
func (widget *Widget) String() string {
args := strings.Join(widget.args, " ")
@@ -55,7 +58,9 @@ func (widget *Widget) String() string {
return fmt.Sprintf(" %s ", widget.cmd)
}
func (widget *Widget) execute() {
/* -------------------- Unexported Functions -------------------- */
func (widget *Widget) execute() string {
cmd := exec.Command(widget.cmd, widget.args...)
widget.result = tview.TranslateANSI(wtf.ExecuteCommand(cmd))
return wtf.ExecuteCommand(cmd)
}