summaryrefslogtreecommitdiff
path: root/widgets/directories.go
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-01-13 15:27:56 -0500
committerDrew DeVault <sir@cmpwn.com>2019-01-13 15:27:56 -0500
commit257affcd4841b8f595a4a13cdb0fd2a1a2dd0faa (patch)
treebf46de891839f66f262ba7d977c22488eaf756f7 /widgets/directories.go
parent24196d2c6fecae4b6bb52dfec14ac9d7e4bd40d4 (diff)
downloadaerc-257affcd4841b8f595a4a13cdb0fd2a1a2dd0faa.zip
Revert "Add abstract list, update dirlist accordingly"
This reverts commit 3157897c1a20e5638feaf56e753b7886bc4ba267.
Diffstat (limited to 'widgets/directories.go')
-rw-r--r--widgets/directories.go71
1 files changed, 26 insertions, 45 deletions
diff --git a/widgets/directories.go b/widgets/directories.go
index ff2f6f5..16b0e5a 100644
--- a/widgets/directories.go
+++ b/widgets/directories.go
@@ -3,7 +3,6 @@ package widgets
import (
"log"
"sort"
- "strings"
"github.com/gdamore/tcell"
@@ -14,7 +13,7 @@ import (
type DirectoryList struct {
conf *config.AccountConfig
- dirs *ui.List
+ dirs []string
logger *log.Logger
onInvalidate func(d ui.Drawable)
worker *types.Worker
@@ -23,68 +22,50 @@ type DirectoryList struct {
func NewDirectoryList(conf *config.AccountConfig,
logger *log.Logger, worker *types.Worker) *DirectoryList {
- return &DirectoryList{
- conf: conf,
- dirs: ui.NewList(),
- logger: logger,
- worker: worker,
- }
+ return &DirectoryList{conf: conf, logger: logger, worker: worker}
}
func (dirlist *DirectoryList) UpdateList() {
- var dirs []ui.Drawable
+ var dirs []string
dirlist.worker.PostAction(
&types.ListDirectories{}, func(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Directory:
- if len(dirlist.conf.Folders) > 1 {
- idx := sort.SearchStrings(dirlist.conf.Folders, msg.Name)
- if idx == len(dirlist.conf.Folders) ||
- dirlist.conf.Folders[idx] != msg.Name {
- break
- }
- }
- dirs = append(dirs, directoryEntry(msg.Name))
+ dirs = append(dirs, msg.Name)
case *types.Done:
- sort.Slice(dirs, func(_a, _b int) bool {
- a, _ := dirs[_a].(directoryEntry)
- b, _ := dirs[_b].(directoryEntry)
- return strings.Compare(string(a), string(b)) > 0
- })
- dirlist.dirs.Set(dirs)
+ sort.Strings(dirs)
+ dirlist.dirs = dirs
+ dirlist.Invalidate()
}
})
}
func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) {
- dirlist.dirs.OnInvalidate(func(_ ui.Drawable) {
- onInvalidate(dirlist)
- })
+ dirlist.onInvalidate = onInvalidate
}
func (dirlist *DirectoryList) Invalidate() {
- dirlist.dirs.Invalidate()
+ if dirlist.onInvalidate != nil {
+ dirlist.onInvalidate(dirlist)
+ }
}
func (dirlist *DirectoryList) Draw(ctx *ui.Context) {
- dirlist.dirs.Draw(ctx)
-}
-
-type directoryEntry string
-
-func (d directoryEntry) OnInvalidate(_ func(_ ui.Drawable)) {
-}
-
-func (d directoryEntry) Invalidate() {
-}
-
-func (d directoryEntry) Draw(ctx *ui.Context) {
- d.DrawWithSelected(ctx, false)
-}
-
-func (d directoryEntry) DrawWithSelected(ctx *ui.Context, selected bool) {
- // TODO: distinguish the selected item
ctx.Fill(0, 0, ctx.Width(), ctx.Height(), ' ', tcell.StyleDefault)
- ctx.Printf(0, 0, tcell.StyleDefault, "%s", d)
+ row := 0
+ for _, name := range dirlist.dirs {
+ if row >= ctx.Height() {
+ break
+ }
+ if len(dirlist.conf.Folders) > 1 {
+ idx := sort.SearchStrings(dirlist.conf.Folders, name)
+ if idx == len(dirlist.conf.Folders) ||
+ dirlist.conf.Folders[idx] != name {
+ continue
+ }
+ }
+ ctx.Printf(0, row, tcell.StyleDefault, "%s", name)
+ row++
+ }
}