blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move: enable MoveMessages from msgstore

Browse source 
Enable the use of MoveMessages worker messages from the UI to the
backend. Completes implemention of MoveMessages for all supported
backends.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-08-16 16:23:41 -05:00 committed by Robin Jarry
parent af72ca3607
commit c98f704874
2 changed files with 50 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/msgstore.go
View file

@ -476,7 +476,7 @@ func (store *MessageStore) Move(uids []uint32, dest string, createDest bool,
}, nil) // quiet doesn't return an error, don't want the done cb here }, nil) // quiet doesn't return an error, don't want the done cb here
} }
store.worker.PostAction(&types.CopyMessages{ store.worker.PostAction(&types.MoveMessages{
Destination: dest, Destination: dest,
Uids: uids, Uids: uids,
}, func(msg types.WorkerMessage) { }, func(msg types.WorkerMessage) {
@ -485,7 +485,7 @@ func (store *MessageStore) Move(uids []uint32, dest string, createDest bool,
store.revertDeleted(uids) store.revertDeleted(uids)
cb(msg) cb(msg)
case *types.Done: case *types.Done:
store.Delete(uids, cb) cb(msg)
} }
}) })
} }

40
widgets/account.go
View file

@ -346,11 +346,30 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
store.Update(msg) store.Update(msg)
} }
case *types.MessagesCopied: case *types.MessagesCopied:
acct.updateDirCounts(msg.Destination, msg.Uids)
case *types.MessagesMoved:
acct.updateDirCounts(msg.Destination, msg.Uids)
case *types.LabelList:
acct.labels = msg.Labels
case *types.ConnError:
logging.Errorf("%s connection error: %v", acct.acct.Name, msg.Error)
acct.SetStatus(statusline.SetConnected(false))
acct.PushError(msg.Error)
acct.msglist.SetStore(nil)
acct.worker.PostAction(&types.Reconnect{}, nil)
case *types.Error:
logging.Errorf("%s unexpected error: %v", acct.acct.Name, msg.Error)
acct.PushError(msg.Error)
}
acct.UpdateStatus()
}
func (acct *AccountView) updateDirCounts(destination string, uids []uint32) {
// Only update the destination destStore if it is initialized // Only update the destination destStore if it is initialized
if destStore, ok := acct.dirlist.MsgStore(msg.Destination); ok { if destStore, ok := acct.dirlist.MsgStore(destination); ok {
var recent, unseen int var recent, unseen int
var accurate bool = true var accurate bool = true
for _, uid := range msg.Uids { for _, uid := range uids {
// Get the message from the originating store // Get the message from the originating store
msg, ok := acct.Store().Messages[uid] msg, ok := acct.Store().Messages[uid]
if !ok { if !ok {
@ -377,30 +396,17 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
if accurate { if accurate {
destStore.DirInfo.Recent += recent destStore.DirInfo.Recent += recent
destStore.DirInfo.Unseen += unseen destStore.DirInfo.Unseen += unseen
destStore.DirInfo.Exists += len(msg.Uids) destStore.DirInfo.Exists += len(uids)
// True. For imap, we don't have the message in the store until we // True. For imap, we don't have the message in the store until we
// Select so we need to rely on the math we just did for accurate // Select so we need to rely on the math we just did for accurate
// counts // counts
destStore.DirInfo.AccurateCounts = true destStore.DirInfo.AccurateCounts = true
} else { } else {
destStore.DirInfo.Exists += len(msg.Uids) destStore.DirInfo.Exists += len(uids)
// False to trigger recount of recent/unseen // False to trigger recount of recent/unseen
destStore.DirInfo.AccurateCounts = false destStore.DirInfo.AccurateCounts = false
} }
} }
case *types.LabelList:
acct.labels = msg.Labels
case *types.ConnError:
logging.Errorf("%s connection error: %v", acct.acct.Name, msg.Error)
acct.SetStatus(statusline.SetConnected(false))
acct.PushError(msg.Error)
acct.msglist.SetStore(nil)
acct.worker.PostAction(&types.Reconnect{}, nil)
case *types.Error:
logging.Errorf("%s unexpected error: %v", acct.acct.Name, msg.Error)
acct.PushError(msg.Error)
}
acct.UpdateStatus()
} }
func (acct *AccountView) GetSortCriteria() []*types.SortCriterion { func (acct *AccountView) GetSortCriteria() []*types.SortCriterion {