aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-01-13 14:25:46 -0500
committerDrew DeVault <sir@cmpwn.com>2019-01-13 14:26:46 -0500
commit2349b7de869e5abc16a419a073273af99b62aad2 (patch)
tree6799b9945f8d6e243e27aa458e21887cf2d9bd01
parentc286d3da6ba8636412db5c3b72fda739a06e7f6c (diff)
Add directory list widget
-rw-r--r--widgets/account.go49
-rw-r--r--widgets/directories.go58
2 files changed, 84 insertions, 23 deletions
diff --git a/widgets/account.go b/widgets/account.go
index d283956..d749f60 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -15,6 +15,7 @@ import (
type AccountView struct {
conf *config.AccountConfig
+ dirlist *DirectoryList
grid *ui.Grid
logger *log.Logger
interactive ui.Interactive
@@ -38,8 +39,6 @@ func NewAccountView(
{ui.SIZE_EXACT, 20},
{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(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{
conf: conf,
+ dirlist: dirlist,
grid: grid,
logger: logger,
statusline: statusline,
@@ -78,27 +81,6 @@ func NewAccountView(
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)) {
acct.grid.OnInvalidate(func(_ ui.Drawable) {
onInvalidate(acct)
@@ -136,3 +118,24 @@ func (acct *AccountView) Event(event tcell.Event) bool {
}
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)
+ }
+}
diff --git a/widgets/directories.go b/widgets/directories.go
new file mode 100644
index 0000000..a9ea7d4
--- /dev/null
+++ b/widgets/directories.go
@@ -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)
+ }
+}