From 76a91813d8dc0f0011202f8120fc197097f022aa Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 May 2020 10:32:32 -0400 Subject: Revert "Remove duration from the status methods" This reverts commit f06d683688e3d2139b14f67b7e349089e7200bf4. --- commands/msgview/next.go | 4 +++- commands/msgview/open.go | 9 +++++---- commands/msgview/save.go | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'commands/msgview') diff --git a/commands/msgview/next.go b/commands/msgview/next.go index 978cf10f..f9fb3d7b 100644 --- a/commands/msgview/next.go +++ b/commands/msgview/next.go @@ -1,6 +1,8 @@ package msgview import ( + "time" + "git.sr.ht/~sircmpwn/aerc/commands/account" "git.sr.ht/~sircmpwn/aerc/lib" "git.sr.ht/~sircmpwn/aerc/widgets" @@ -40,7 +42,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { lib.NewMessageStoreView(nextMsg, store, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { - aerc.PushError(err.Error()) + aerc.PushError(err.Error(), 10*time.Second) return } nextMv := widgets.NewMessageViewer(acct, aerc.Config(), view) diff --git a/commands/msgview/open.go b/commands/msgview/open.go index e2545e35..7f26542a 100644 --- a/commands/msgview/open.go +++ b/commands/msgview/open.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "mime" "os" + "time" "git.sr.ht/~sircmpwn/aerc/lib" "git.sr.ht/~sircmpwn/aerc/widgets" @@ -48,23 +49,23 @@ func (Open) Execute(aerc *widgets.Aerc, args []string) error { tmpFile, err := ioutil.TempFile(os.TempDir(), "aerc-*"+extension) if err != nil { - aerc.PushError(" " + err.Error()) + aerc.PushError(" "+err.Error(), 10*time.Second) return } defer tmpFile.Close() _, err = io.Copy(tmpFile, reader) if err != nil { - aerc.PushError(" " + err.Error()) + aerc.PushError(" "+err.Error(), 10*time.Second) return } err = lib.OpenFile(tmpFile.Name()) if err != nil { - aerc.PushError(" " + err.Error()) + aerc.PushError(" "+err.Error(), 10*time.Second) } - aerc.PushStatus("Opened") + aerc.PushStatus("Opened", 10*time.Second) }) return nil diff --git a/commands/msgview/save.go b/commands/msgview/save.go index 7dbb0df7..ea1b8f34 100644 --- a/commands/msgview/save.go +++ b/commands/msgview/save.go @@ -128,10 +128,10 @@ func (Save) Execute(aerc *widgets.Aerc, args []string) error { go func() { err := <-ch if err != nil { - aerc.PushError(fmt.Sprintf("Save failed: %v", err)) + aerc.PushError(fmt.Sprintf("Save failed: %v", err), 10*time.Second) return } - aerc.PushStatus("Saved to " + path) + aerc.PushStatus("Saved to "+path, 10*time.Second) }() return nil } -- cgit