_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use aerc.PushError where appropriate 

Forgot an unused import, to save you the hassle here is v2.
This commit is contained in:
Ben Fiedler 2020-04-23 03:56:28 +02:00 committed by Reto Brunner
parent 280d8e7e1c
commit 7c89143c70
13 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands/account/mkdir.go
View File

@ -5,8 +5,6 @@ import (
"strings"
"time"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/widgets"
"git.sr.ht/~sircmpwn/aerc/worker/types"
)
@ -42,8 +40,7 @@ func (MakeDir) Execute(aerc *widgets.Aerc, args []string) error {
aerc.PushStatus("Directory created.", 10*time.Second)
acct.Directories().Select(name)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
}
})
return nil

3
commands/compose/send.go
View File

@ -246,8 +246,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
r.Close()
composer.Close()
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
r.Close()
composer.Close()
}

3
commands/exec.go
View File

@ -33,8 +33,7 @@ func (ExecCmd) Execute(aerc *widgets.Aerc, args []string) error {
go func() {
err := cmd.Run()
if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+err.Error())
} else {
color := tcell.ColorDefault
if cmd.ProcessState.ExitCode() != 0 {

5
commands/msg/archive.go
View File

@ -7,8 +7,6 @@ import (
"sync"
"time"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/models"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -88,8 +86,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
case *types.Done:
wg.Done()
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
success = false
wg.Done()
}

4
commands/msg/copy.go
View File

@ -6,7 +6,6 @@ import (
"time"
"git.sr.ht/~sircmpwn/getopt"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -61,8 +60,7 @@ func (Copy) Execute(aerc *widgets.Aerc, args []string) error {
case *types.Done:
aerc.PushStatus("Messages copied.", 10*time.Second)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
}
})
return nil

5
commands/msg/delete.go
View File

@ -4,8 +4,6 @@ import (
"errors"
"time"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/lib"
"git.sr.ht/~sircmpwn/aerc/models"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -49,8 +47,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
case *types.Done:
aerc.PushStatus("Messages deleted.", 10*time.Second)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
}
})

4
commands/msg/modify-labels.go
View File

@ -7,7 +7,6 @@ import (
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
"git.sr.ht/~sircmpwn/aerc/worker/types"
"github.com/gdamore/tcell"
)
type ModifyLabels struct{}
@ -59,8 +58,7 @@ func (ModifyLabels) Execute(aerc *widgets.Aerc, args []string) error {
case *types.Done:
aerc.PushStatus("labels updated", 10*time.Second)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
}
})
return nil

4
commands/msg/move.go
View File

@ -6,7 +6,6 @@ import (
"time"
"git.sr.ht/~sircmpwn/getopt"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -72,8 +71,7 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error {
case *types.Done:
aerc.PushStatus("Message moved to "+joinedArgs, 10*time.Second)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
}
})
return nil

3
commands/msg/pipe.go
View File

@ -93,8 +93,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
}()
err = ecmd.Run()
if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+err.Error())
} else {
color := tcell.ColorDefault
if ecmd.ProcessState.ExitCode() != 0 {

8
commands/msg/read.go
View File

@ -7,8 +7,6 @@ import (
"git.sr.ht/~sircmpwn/getopt"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/lib"
"git.sr.ht/~sircmpwn/aerc/models"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -95,8 +93,7 @@ func submitReadChange(aerc *widgets.Aerc, store *lib.MessageStore,
case *types.Done:
aerc.PushStatus(msg_success, 10*time.Second)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
}
})
}
@ -109,8 +106,7 @@ func submitReadChangeWg(aerc *widgets.Aerc, store *lib.MessageStore,
case *types.Done:
wg.Done()
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+msg.Error.Error())
*success = false
wg.Done()
}

9
commands/term.go
View File

@ -2,12 +2,10 @@ package commands
import (
"os/exec"
"time"
"github.com/riywo/loginshell"
"git.sr.ht/~sircmpwn/aerc/widgets"
"github.com/gdamore/tcell"
"github.com/riywo/loginshell"
)
type Term struct{}
@ -48,8 +46,7 @@ func TermCore(aerc *widgets.Aerc, args []string) error {
term.OnClose = func(err error) {
aerc.RemoveTab(term)
if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+err.Error())
}
}
return nil

10
widgets/account-wizard.go
View File

@ -10,7 +10,6 @@ import (
"path"
"strconv"
"strings"
"time"
"github.com/gdamore/tcell"
"github.com/go-ini/ini"
@ -415,8 +414,7 @@ func (wizard *AccountWizard) ConfigureTemporaryAccount(temporary bool) {
func (wizard *AccountWizard) errorFor(d ui.Interactive, err error) {
if d == nil {
wizard.aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
wizard.aerc.PushError(" "+err.Error())
wizard.Invalidate()
return
}
@ -431,8 +429,7 @@ func (wizard *AccountWizard) errorFor(d ui.Interactive, err error) {
wizard.step = step
wizard.focus = focus
wizard.Focus(true)
wizard.aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
wizard.aerc.PushError(" "+err.Error())
wizard.Invalidate()
return
}
@ -543,8 +540,7 @@ func (wizard *AccountWizard) finish(tutorial bool) {
term.OnClose = func(err error) {
wizard.aerc.RemoveTab(term)
if err != nil {
wizard.aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
wizard.aerc.PushError(" "+err.Error())
}
}
}

9
widgets/aerc.go
View File

@ -408,13 +408,11 @@ func (aerc *Aerc) BeginExCommand(cmd string) {
exline := NewExLine(aerc.conf, cmd, func(cmd string) {
parts, err := shlex.Split(cmd)
if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+err.Error())
}
err = aerc.cmd(parts)
if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+err.Error())
}
// only add to history if this is an unsimulated command,
// ie one not executed from a keybinding
@ -438,8 +436,7 @@ func (aerc *Aerc) RegisterPrompt(prompt string, cmd []string) {
}
err := aerc.cmd(cmd)
if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
aerc.PushError(" "+err.Error())
}
}, func(cmd string) []string {
return nil // TODO: completions