Get rid of the aerc.PushError(" " + $string) idiom
The individual callers should not be responsible for padding
This commit is contained in:
parent
949781fa0a
commit
8ea86cea41
18 changed files with 29 additions and 29 deletions
|
@ -86,7 +86,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
case *types.Done:
|
||||
wg.Done()
|
||||
case *types.Error:
|
||||
aerc.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
success = false
|
||||
wg.Done()
|
||||
}
|
||||
|
|
|
@ -60,7 +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.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
}
|
||||
})
|
||||
return nil
|
||||
|
|
|
@ -47,7 +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.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
case *types.Unsupported:
|
||||
// notmuch doesn't support it, we want the user to know
|
||||
aerc.PushError(" error, unsupported for this worker")
|
||||
|
|
|
@ -58,7 +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.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
}
|
||||
})
|
||||
return nil
|
||||
|
|
|
@ -71,7 +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.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
}
|
||||
})
|
||||
return nil
|
||||
|
|
|
@ -75,7 +75,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
doTerm := func(reader io.Reader, name string) {
|
||||
term, err := commands.QuickTerm(aerc, cmd, reader)
|
||||
if err != nil {
|
||||
aerc.PushError(" " + err.Error())
|
||||
aerc.PushError(err.Error())
|
||||
return
|
||||
}
|
||||
aerc.NewTab(term, name)
|
||||
|
@ -93,7 +93,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
}()
|
||||
err = ecmd.Run()
|
||||
if err != nil {
|
||||
aerc.PushError(" " + err.Error())
|
||||
aerc.PushError(err.Error())
|
||||
} else {
|
||||
if ecmd.ProcessState.ExitCode() != 0 {
|
||||
aerc.PushError(fmt.Sprintf(
|
||||
|
|
|
@ -187,7 +187,7 @@ func submitFlagChange(aerc *widgets.Aerc, store *lib.MessageStore,
|
|||
case *types.Done:
|
||||
wg.Done()
|
||||
case *types.Error:
|
||||
aerc.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
*success = false
|
||||
wg.Done()
|
||||
}
|
||||
|
|
|
@ -86,7 +86,7 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
}, func(msg types.WorkerMessage) {
|
||||
switch msg := msg.(type) {
|
||||
case *types.Error:
|
||||
aerc.PushError(" " + msg.Error.Error())
|
||||
aerc.PushError(msg.Error.Error())
|
||||
composer.Close()
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue