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

dirlist: fix panic when disconnecting with dirlist-tree=false

Browse source 
Commit 2027223a created a panic when attempting to clear the dirlist
when the config option dirlist-tree is set to false.

This patch fixes that panic by creating a dirlist.ClearList() function
to prevent needing to check a callback.

Tested with both dirlist-tree=false and true

Fixes: 2027223ab3 ("fix: clear dirlist on disconnect")
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-06-07 10:59:05 -05:00 committed by Robin Jarry
parent 2027223ab3
commit 115447e57f
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
widgets/account.go
View file

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

17
widgets/dirlist.go
View file

@ -31,7 +31,7 @@ type DirectoryLister interface {
UpdateList(func([]string))
List() []string
SetConnected(bool)
ClearList()
NextPrev(int)
@ -93,24 +93,15 @@ func (dirlist *DirectoryList) UiConfig() config.UIConfig {
})
}
func (dirlist *DirectoryList) SetConnected(c bool) {
dirlist.connected = c
}
func (dirlist *DirectoryList) List() []string {
return dirlist.store.List()
}
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
func (dirlist *DirectoryList) ClearList() {
dirlist.dirs = []string{}
dirlist.Invalidate()
// Call callback with empty array for dirtree
done(dirlist.dirs)
return
}
func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) {
// TODO: move this logic into dirstore
var dirs []string
dirlist.worker.PostAction(

4
widgets/dirtree.go
View file

@ -32,6 +32,10 @@ func NewDirectoryTree(dirlist *DirectoryList, pathSeparator string) DirectoryLis
return dt
}
func (dt *DirectoryTree) ClearList() {
dt.list = make([]*types.Thread, 0)
}
func (dt *DirectoryTree) UpdateList(done func([]string)) {
dt.DirectoryList.UpdateList(func(dirs []string) {
if done != nil {