aerc

Working clone of aerc-mail.org
git clone git://git.danielmoch.com/aerc.git
Log | Files | Refs | README | LICENSE

commit 2e5ae1946bb3f55d00db5a1deebde2c84826ebf6
parent 07138146a01d802e4d1b5a7d0ccf4601d89eeef8
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 14 May 2019 16:55:50 -0400

Implement move, mv commands

Diffstat:
Acommands/account/move.go | 38++++++++++++++++++++++++++++++++++++++
Mlib/msgstore.go | 27+++++++++++++++++++++++++++
Mworker/types/messages.go | 6------
3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/commands/account/move.go b/commands/account/move.go @@ -0,0 +1,38 @@ +package account + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc2/widgets" + "git.sr.ht/~sircmpwn/aerc2/worker/types" +) + +func init() { + register("mv", Move) + register("move", Move) +} + +func Move(aerc *widgets.Aerc, args []string) error { + if len(args) != 2 { + return errors.New("Usage: mv <folder>") + } + acct := aerc.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + msg := acct.Messages().Selected() + store := acct.Messages().Store() + store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages moved.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/lib/msgstore.go b/lib/msgstore.go @@ -246,3 +246,30 @@ func (store *MessageStore) Copy(uids []uint32, dest string, Uids: set, }, cb) } + +func (store *MessageStore) Move(uids []uint32, dest string, + cb func(msg types.WorkerMessage)) { + store.Lock() + + var set imap.SeqSet + for _, uid := range uids { + set.AddNum(uid) + store.Deleted[uid] = nil + } + + store.Unlock() + + store.worker.PostAction(&types.CopyMessages{ + Destination: dest, + Uids: set, + }, func(msg types.WorkerMessage) { + switch msg.(type) { + case *types.Error: + cb(msg) + case *types.Done: + store.worker.PostAction(&types.DeleteMessages{Uids: set}, cb) + } + }) + + store.update() +} diff --git a/worker/types/messages.go b/worker/types/messages.go @@ -103,12 +103,6 @@ type CopyMessages struct { Uids imap.SeqSet } -type MoveMessages struct { - Message - Destination string - Uids imap.SeqSet -} - // Messages type CertificateApprovalRequest struct {