Add directory list widget

This commit is contained in:
Drew DeVault 2019-01-13 14:25:46 -05:00
parent c286d3da6b
commit 2349b7de86
2 changed files with 84 additions and 23 deletions

View File

@ -15,6 +15,7 @@ import (
type AccountView struct { type AccountView struct {
conf *config.AccountConfig conf *config.AccountConfig
dirlist *DirectoryList
grid *ui.Grid grid *ui.Grid
logger *log.Logger logger *log.Logger
interactive ui.Interactive interactive ui.Interactive
@ -38,8 +39,6 @@ func NewAccountView(
{ui.SIZE_EXACT, 20}, {ui.SIZE_EXACT, 20},
{ui.SIZE_WEIGHT, 1}, {ui.SIZE_WEIGHT, 1},
}) })
grid.AddChild(ui.NewBordered(
ui.NewFill('s'), ui.BORDER_RIGHT)).Span(2, 1)
grid.AddChild(ui.NewFill('.')).At(0, 1) grid.AddChild(ui.NewFill('.')).At(0, 1)
grid.AddChild(statusbar).At(1, 1) grid.AddChild(statusbar).At(1, 1)
@ -54,8 +53,12 @@ func NewAccountView(
} }
} }
dirlist := NewDirectoryList(logger, worker)
grid.AddChild(ui.NewBordered(dirlist, ui.BORDER_RIGHT)).Span(2, 1)
acct := &AccountView{ acct := &AccountView{
conf: conf, conf: conf,
dirlist: dirlist,
grid: grid, grid: grid,
logger: logger, logger: logger,
statusline: statusline, statusline: statusline,
@ -78,27 +81,6 @@ func NewAccountView(
return acct return acct
} }
func (acct *AccountView) connected(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
acct.statusline.Set("Connected.")
acct.logger.Println("Connected.")
acct.worker.PostAction(&types.ListDirectories{}, nil)
case *types.CertificateApprovalRequest:
// TODO: Ask the user
acct.logger.Println("Approved unknown certificate.")
acct.statusline.Push("Approved unknown certificate.", 5*time.Second)
acct.worker.PostAction(&types.ApproveCertificate{
Message: types.RespondTo(msg),
Approved: true,
}, acct.connected)
default:
acct.logger.Println("Connection failed.")
acct.statusline.Set("Connection failed.").
Color(tcell.ColorRed, tcell.ColorDefault)
}
}
func (acct *AccountView) OnInvalidate(onInvalidate func(d ui.Drawable)) { func (acct *AccountView) OnInvalidate(onInvalidate func(d ui.Drawable)) {
acct.grid.OnInvalidate(func(_ ui.Drawable) { acct.grid.OnInvalidate(func(_ ui.Drawable) {
onInvalidate(acct) onInvalidate(acct)
@ -136,3 +118,24 @@ func (acct *AccountView) Event(event tcell.Event) bool {
} }
return false return false
} }
func (acct *AccountView) connected(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
acct.statusline.Set("Connected.")
acct.logger.Println("Connected.")
acct.dirlist.UpdateList()
case *types.CertificateApprovalRequest:
// TODO: Ask the user
acct.logger.Println("Approved unknown certificate.")
acct.statusline.Push("Approved unknown certificate.", 5*time.Second)
acct.worker.PostAction(&types.ApproveCertificate{
Message: types.RespondTo(msg),
Approved: true,
}, acct.connected)
default:
acct.logger.Println("Connection failed.")
acct.statusline.Set("Connection failed.").
Color(tcell.ColorRed, tcell.ColorDefault)
}
}

58
widgets/directories.go Normal file
View File

@ -0,0 +1,58 @@
package widgets
import (
"log"
"sort"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc2/lib/ui"
"git.sr.ht/~sircmpwn/aerc2/worker/types"
)
type DirectoryList struct {
dirs []string
logger *log.Logger
onInvalidate func(d ui.Drawable)
worker *types.Worker
}
func NewDirectoryList(logger *log.Logger, worker *types.Worker) *DirectoryList {
return &DirectoryList{logger: logger, worker: worker}
}
func (dirlist *DirectoryList) UpdateList() {
var dirs []string
dirlist.worker.PostAction(
&types.ListDirectories{}, func(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Directory:
dirs = append(dirs, msg.Name)
case *types.Done:
sort.Strings(dirs)
dirlist.dirs = dirs
dirlist.Invalidate()
}
})
}
func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) {
dirlist.onInvalidate = onInvalidate
}
func (dirlist *DirectoryList) Invalidate() {
if dirlist.onInvalidate != nil {
dirlist.onInvalidate(dirlist)
}
}
func (dirlist *DirectoryList) Draw(ctx *ui.Context) {
ctx.Fill(0, 0, ctx.Width(), ctx.Height(), ' ', tcell.StyleDefault)
for i, name := range dirlist.dirs {
if i >= ctx.Height() {
break
}
ctx.Printf(0, i, tcell.StyleDefault, "%s", name)
}
}