Implement move, mv commands

This commit is contained in:
Drew DeVault 2019-05-14 16:55:50 -04:00
parent 07138146a0
commit 2e5ae1946b
3 changed files with 65 additions and 6 deletions

38
commands/account/move.go Normal file
View File

@ -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
}

View File

@ -246,3 +246,30 @@ func (store *MessageStore) Copy(uids []uint32, dest string,
Uids: set, Uids: set,
}, cb) }, 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()
}

View File

@ -103,12 +103,6 @@ type CopyMessages struct {
Uids imap.SeqSet Uids imap.SeqSet
} }
type MoveMessages struct {
Message
Destination string
Uids imap.SeqSet
}
// Messages // Messages
type CertificateApprovalRequest struct { type CertificateApprovalRequest struct {