From caad1b2c06a0446059ee5ee916e3dce1794b159b Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 May 2020 10:32:42 -0400 Subject: Revert "Add Style configuration" This reverts commit 0f78f06610c0e8887aba2ae50e99b86477a384b3. --- commands/msg/archive.go | 2 +- commands/msg/copy.go | 2 +- commands/msg/delete.go | 4 ++-- commands/msg/forward.go | 3 +-- commands/msg/modify-labels.go | 2 +- commands/msg/move.go | 2 +- commands/msg/pipe.go | 18 +++++++++--------- commands/msg/read.go | 4 ++-- commands/msg/recall.go | 3 +-- commands/msg/reply.go | 3 +-- 10 files changed, 20 insertions(+), 23 deletions(-) (limited to 'commands/msg') diff --git a/commands/msg/archive.go b/commands/msg/archive.go index ba7e1f7..5561674 100644 --- a/commands/msg/archive.go +++ b/commands/msg/archive.go @@ -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(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) success = false wg.Done() } diff --git a/commands/msg/copy.go b/commands/msg/copy.go index e822c5c..f3d4030 100644 --- a/commands/msg/copy.go +++ b/commands/msg/copy.go @@ -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(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/msg/delete.go b/commands/msg/delete.go index 482b60c..4bda8b9 100644 --- a/commands/msg/delete.go +++ b/commands/msg/delete.go @@ -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(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) } }) @@ -68,7 +68,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error { lib.NewMessageStoreView(next, store, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { - aerc.PushError(err.Error(), 10*time.Second) + aerc.PushError(err.Error()) return } nextMv := widgets.NewMessageViewer(acct, aerc.Config(), view) diff --git a/commands/msg/forward.go b/commands/msg/forward.go index 5dd51b2..28abbed 100644 --- a/commands/msg/forward.go +++ b/commands/msg/forward.go @@ -9,7 +9,6 @@ import ( "os" "path" "strings" - "time" "git.sr.ht/~sircmpwn/aerc/models" "git.sr.ht/~sircmpwn/aerc/widgets" @@ -84,7 +83,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error { composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(), acct.Worker(), template, defaults, original) if err != nil { - aerc.PushError("Error: "+err.Error(), 10*time.Second) + aerc.PushError("Error: " + err.Error()) return nil, err } diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go index d74aece..f91075a 100644 --- a/commands/msg/modify-labels.go +++ b/commands/msg/modify-labels.go @@ -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(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/msg/move.go b/commands/msg/move.go index a19194e..830e752 100644 --- a/commands/msg/move.go +++ b/commands/msg/move.go @@ -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(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go index 15b8c52..c88d61f 100644 --- a/commands/msg/pipe.go +++ b/commands/msg/pipe.go @@ -12,6 +12,7 @@ import ( "git.sr.ht/~sircmpwn/aerc/worker/types" "git.sr.ht/~sircmpwn/getopt" + "github.com/gdamore/tcell" ) type Pipe struct{} @@ -75,7 +76,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(), 10*time.Second) + aerc.PushError(" " + err.Error()) return } aerc.NewTab(term, name) @@ -93,17 +94,16 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error { }() err = ecmd.Run() if err != nil { - aerc.PushError(" "+err.Error(), 10*time.Second) + aerc.PushError(" " + err.Error()) } else { + color := tcell.ColorDefault if ecmd.ProcessState.ExitCode() != 0 { - aerc.PushError(fmt.Sprintf( - "%s: completed with status %d", cmd[0], - ecmd.ProcessState.ExitCode()), 10*time.Second) - } else { - aerc.PushStatus(fmt.Sprintf( - "%s: completed with status %d", cmd[0], - ecmd.ProcessState.ExitCode()), 10*time.Second) + color = tcell.ColorRed } + aerc.PushStatus(fmt.Sprintf( + "%s: completed with status %d", cmd[0], + ecmd.ProcessState.ExitCode()), 10*time.Second). + Color(tcell.ColorDefault, color) } } diff --git a/commands/msg/read.go b/commands/msg/read.go index e27f743..1e264c2 100644 --- a/commands/msg/read.go +++ b/commands/msg/read.go @@ -93,7 +93,7 @@ func submitReadChange(aerc *widgets.Aerc, store *lib.MessageStore, case *types.Done: aerc.PushStatus(msg_success, 10*time.Second) case *types.Error: - aerc.PushError(" "+msg.Error.Error(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) } }) } @@ -106,7 +106,7 @@ func submitReadChangeWg(aerc *widgets.Aerc, store *lib.MessageStore, case *types.Done: wg.Done() case *types.Error: - aerc.PushError(" "+msg.Error.Error(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) *success = false wg.Done() } diff --git a/commands/msg/recall.go b/commands/msg/recall.go index 6c5e973..7c9ac19 100644 --- a/commands/msg/recall.go +++ b/commands/msg/recall.go @@ -2,7 +2,6 @@ package msg import ( "io" - "time" "github.com/emersion/go-message" _ "github.com/emersion/go-message/charset" @@ -92,7 +91,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(), 10*time.Second) + aerc.PushError(" " + msg.Error.Error()) composer.Close() } }) diff --git a/commands/msg/reply.go b/commands/msg/reply.go index 455c7ca..28ce245 100644 --- a/commands/msg/reply.go +++ b/commands/msg/reply.go @@ -7,7 +7,6 @@ import ( "io" gomail "net/mail" "strings" - "time" "git.sr.ht/~sircmpwn/getopt" @@ -140,7 +139,7 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(), acct.Worker(), template, defaults, original) if err != nil { - aerc.PushError("Error: "+err.Error(), 10*time.Second) + aerc.PushError("Error: " + err.Error()) return err } -- cgit 1.4.1-2-gfad0