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

fix: clear dirlist on disconnect

Browse source 
A message of Done:Disconnect will trigger an update of the dirlist. An
update of the dirlist will issue a ListDirectories message, which causes
an imap: client not ready error by trying to use the imap connection -
which is disconnected. By not issuing the update, we prevent using a
disconnected client.

This patch checks for connection state prior to updating the dirlist. A
disconnected state will clear out the dirlist.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-06-03 13:34:01 -05:00 committed by Robin Jarry
parent 955f7683af
commit 2027223ab3
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
widgets/account.go
View file

@ -246,6 +246,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
case *types.Connect, *types.Reconnect: case *types.Connect, *types.Reconnect:
acct.SetStatus(statusline.ConnectionActivity("Listing mailboxes...")) acct.SetStatus(statusline.ConnectionActivity("Listing mailboxes..."))
acct.logger.Println("Listing mailboxes...") acct.logger.Println("Listing mailboxes...")
acct.dirlist.SetConnected(true)
acct.dirlist.UpdateList(func(dirs []string) { acct.dirlist.UpdateList(func(dirs []string) {
var dir string var dir string
for _, _dir := range dirs { for _, _dir := range dirs {
@ -266,6 +267,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
acct.newConn = true acct.newConn = true
}) })
case *types.Disconnect: case *types.Disconnect:
acct.dirlist.SetConnected(false)
acct.dirlist.UpdateList(nil) acct.dirlist.UpdateList(nil)
acct.msglist.SetStore(nil) acct.msglist.SetStore(nil)
acct.logger.Println("Disconnected.") acct.logger.Println("Disconnected.")

15
widgets/dirlist.go
View file

@ -31,6 +31,7 @@ type DirectoryLister interface {
UpdateList(func([]string)) UpdateList(func([]string))
List() []string List() []string
SetConnected(bool)
NextPrev(int) NextPrev(int)
@ -57,6 +58,7 @@ type DirectoryList struct {
spinner *Spinner spinner *Spinner
worker *types.Worker worker *types.Worker
skipSelect chan bool skipSelect chan bool
connected bool
} }
func NewDirectoryList(conf *config.AercConfig, acctConf *config.AccountConfig, func NewDirectoryList(conf *config.AercConfig, acctConf *config.AccountConfig,
@ -91,11 +93,24 @@ func (dirlist *DirectoryList) UiConfig() config.UIConfig {
}) })
} }
func (dirlist *DirectoryList) SetConnected(c bool) {
dirlist.connected = c
}
func (dirlist *DirectoryList) List() []string { func (dirlist *DirectoryList) List() []string {
return dirlist.store.List() return dirlist.store.List()
} }
func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) { func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) {
// Clear out dirlist if not connected
if !dirlist.connected {
// Only dirlist.dirs is used for the UI. No need to update dirstore
dirlist.dirs = []string{}
dirlist.Invalidate()
// Call callback with empty array for dirtree
done(dirlist.dirs)
return
}
// TODO: move this logic into dirstore // TODO: move this logic into dirstore
var dirs []string var dirs []string
dirlist.worker.PostAction( dirlist.worker.PostAction(