_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove the dirInfoUpdateRequest functionality 

The notmuch worker followed suit in handling the dirInfo submission manually.
That removes the last user so we might as well remove the functionality.
This commit is contained in:
Reto Brunner 2020-02-29 14:40:52 +01:00 committed by Drew DeVault
parent fb2df7e169
commit f3dbecaaea
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/msgstore.go
View File

@ -183,7 +183,6 @@ func merge(to *models.MessageInfo, from *models.MessageInfo) {
func (store *MessageStore) Update(msg types.WorkerMessage) { func (store *MessageStore) Update(msg types.WorkerMessage) {
update := false update := false
directoryChange := false directoryChange := false
requestDirInfo := false
switch msg := msg.(type) { switch msg := msg.(type) {
case *types.DirectoryInfo: case *types.DirectoryInfo:
store.DirInfo = *msg.Info store.DirInfo = *msg.Info
@ -229,7 +228,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
} }
} }
update = true update = true
requestDirInfo = true
case *types.FullMessage: case *types.FullMessage:
if _, ok := store.pendingBodies[msg.Content.Uid]; ok { if _, ok := store.pendingBodies[msg.Content.Uid]; ok {
delete(store.pendingBodies, msg.Content.Uid) delete(store.pendingBodies, msg.Content.Uid)
@ -263,7 +261,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
} }
store.uids = uids store.uids = uids
update = true update = true
requestDirInfo = true
} }
if update { if update {
@ -273,18 +270,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
if directoryChange && store.triggerDirectoryChange != nil { if directoryChange && store.triggerDirectoryChange != nil {
store.triggerDirectoryChange() store.triggerDirectoryChange()
} }
if requestDirInfo {
select {
case <-store.dirInfoUpdateDebounce.C:
store.worker.PostAction(&types.DirectoryInfoUpdateRequest{
Name: store.DirInfo.Name,
}, nil)
store.dirInfoUpdateDebounce.Reset(store.dirInfoUpdateDelay)
default:
// do nothing
}
}
} }
func (store *MessageStore) OnUpdate(fn func(store *MessageStore)) { func (store *MessageStore) OnUpdate(fn func(store *MessageStore)) {

2
worker/imap/worker.go
View File

@ -181,8 +181,6 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
w.handleAppendMessage(msg) w.handleAppendMessage(msg)
case *types.SearchDirectory: case *types.SearchDirectory:
w.handleSearchDirectory(msg) w.handleSearchDirectory(msg)
case *types.DirectoryInfoUpdateRequest:
// not implemented
default: default:
reterr = errUnsupported reterr = errUnsupported
} }

7
worker/types/messages.go
View File

@ -149,13 +149,6 @@ type DirectoryInfo struct {
Info *models.DirectoryInfo Info *models.DirectoryInfo
} }
// Sent whenever we assume that a directory content changed
// workers are requested to update the DirectoryInfo to display the unread count
type DirectoryInfoUpdateRequest struct {
Message
Name string
}
type DirectoryContents struct { type DirectoryContents struct {
Message Message
Uids []uint32 Uids []uint32