diff options
| author | Reto Brunner <reto@labrat.space> | 2020-02-29 14:40:52 +0100 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2020-02-29 13:16:33 -0500 |
| commit | f3dbecaaea16fe8956af2bbd29472243f0496995 (patch) | |
| tree | 086fe851440ababd9eb5a6da73c48fd9068f1081 | |
| parent | fb2df7e1694a99c8c74e931453aa863125e208f2 (diff) | |
| download | aerc-f3dbecaaea16fe8956af2bbd29472243f0496995.tar.gz | |
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.
| -rw-r--r-- | lib/msgstore.go | 15 | ||||
| -rw-r--r-- | worker/imap/worker.go | 2 | ||||
| -rw-r--r-- | worker/types/messages.go | 7 |
3 files changed, 0 insertions, 24 deletions
diff --git a/lib/msgstore.go b/lib/msgstore.go index 709c7a2..481fcb9 100644 --- a/lib/msgstore.go +++ b/lib/msgstore.go @@ -183,7 +183,6 @@ func merge(to *models.MessageInfo, from *models.MessageInfo) { func (store *MessageStore) Update(msg types.WorkerMessage) { update := false directoryChange := false - requestDirInfo := false switch msg := msg.(type) { case *types.DirectoryInfo: store.DirInfo = *msg.Info @@ -229,7 +228,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) { } } update = true - requestDirInfo = true case *types.FullMessage: if _, ok := store.pendingBodies[msg.Content.Uid]; ok { delete(store.pendingBodies, msg.Content.Uid) @@ -263,7 +261,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) { } store.uids = uids update = true - requestDirInfo = true } if update { @@ -273,18 +270,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) { if directoryChange && store.triggerDirectoryChange != nil { 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)) { diff --git a/worker/imap/worker.go b/worker/imap/worker.go index 1037f81..ddd95b6 100644 --- a/worker/imap/worker.go +++ b/worker/imap/worker.go @@ -181,8 +181,6 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error { w.handleAppendMessage(msg) case *types.SearchDirectory: w.handleSearchDirectory(msg) - case *types.DirectoryInfoUpdateRequest: - // not implemented default: reterr = errUnsupported } diff --git a/worker/types/messages.go b/worker/types/messages.go index f43ab0a..c7d5077 100644 --- a/worker/types/messages.go +++ b/worker/types/messages.go @@ -149,13 +149,6 @@ type DirectoryInfo struct { 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 { Message Uids []uint32 |