aniani/neonmodem
1
0
Fork 0
mirror of https://github.com/mrusme/neonmodem.git synced 2024-12-04 14:46:37 -05:00
Code

Refactored MsgError

Browse Source
This commit is contained in:
マリウス 2023-01-05 12:21:26 -05:00
parent a61772e3b0
commit e234ab044e
No known key found for this signature in database
GPG Key ID: 272ED814BF63261F
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/windows/msgerror/handlers.go
View File

@ -27,11 +27,15 @@ func handleMsgErrorCmd(mi interface{}, c cmd.Command) (bool, []tea.Cmd) {
var m *Model = mi.(*Model) var m *Model = mi.(*Model)
var cmds []tea.Cmd var cmds []tea.Cmd
m.err = c.GetArg("error").(error) if err := c.GetArg("error"); err != nil {
if m.err != nil { m.errs = append(m.errs, err.(error))
m.viewport.SetContent(m.err.Error())
m.tk.CacheView(m)
} }
if errs := c.GetArg("errors"); errs != nil {
m.errs = append(m.errs, errs.([]error)...)
}
m.setErrorContent()
m.tk.CacheView(m)
return true, cmds return true, cmds
} }
@ -40,7 +44,7 @@ func handleWinCloseCmd(mi interface{}, c cmd.Command) (bool, []tea.Cmd) {
var cmds []tea.Cmd var cmds []tea.Cmd
if c.Target == WIN_ID { if c.Target == WIN_ID {
m.err = nil m.errs = []error{}
return true, cmds return true, cmds
} }

19
ui/windows/msgerror/msgerror.go
View File

@ -30,7 +30,7 @@ type Model struct {
a *aggregator.Aggregator a *aggregator.Aggregator
err error errs []error
viewcache string viewcache string
viewcacheTextareaXY []int viewcacheTextareaXY []int
@ -50,7 +50,7 @@ func NewModel(c *ctx.Ctx) Model {
), ),
xywh: [4]int{0, 0, 0, 0}, xywh: [4]int{0, 0, 0, 0},
err: nil, errs: []error{},
viewcache: "", viewcache: "",
viewcacheTextareaXY: []int{0, 0, 0, 0}, viewcacheTextareaXY: []int{0, 0, 0, 0},
@ -77,12 +77,19 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var vcmd tea.Cmd var vcmd tea.Cmd
m.ctx.Logger.Debugf("ERROR IS: %v\n", m.err) m.setErrorContent()
if m.err != nil {
m.viewport.SetContent(m.err.Error())
}
m.viewport, vcmd = m.viewport.Update(msg) m.viewport, vcmd = m.viewport.Update(msg)
cmds = append(cmds, vcmd) cmds = append(cmds, vcmd)
return m, tea.Batch(cmds...) return m, tea.Batch(cmds...)
} }
func (m *Model) setErrorContent() {
if len(m.errs) > 0 {
var tmp string = ""
for _, err := range m.errs {
tmp += err.Error() + "\n"
}
m.viewport.SetContent(tmp)
}
}