Implement :cd command

This commit is contained in:
Drew DeVault 2019-03-14 22:34:34 -04:00
parent de364846cc
commit 62946ff6c5
4 changed files with 59 additions and 6 deletions

35
commands/cd.go Normal file
View File

@ -0,0 +1,35 @@
package commands
import (
"errors"
"git.sr.ht/~sircmpwn/aerc2/widgets"
)
var (
history map[string]string
)
func init() {
history = make(map[string]string)
Register("cd", ChangeDirectory)
}
func ChangeDirectory(aerc *widgets.Aerc, args []string) error {
if len(args) != 2 {
return errors.New("Usage: cd <directory>")
}
acct := aerc.SelectedAccount()
previous := acct.Directories().Selected()
if args[1] == "-" {
if dir, ok := history[acct.Name()]; ok {
acct.Directories().Select(dir)
} else {
return errors.New("No previous directory to return to")
}
} else {
acct.Directories().Select(args[1])
}
history[acct.Name()] = previous
return nil
}

View File

@ -14,11 +14,10 @@ var (
commands map[string]AercCommand commands map[string]AercCommand
) )
func init() {
commands = make(map[string]AercCommand)
}
func Register(name string, cmd AercCommand) { func Register(name string, cmd AercCommand) {
if commands == nil {
commands = make(map[string]AercCommand)
}
commands[name] = cmd commands[name] = cmd
} }

View File

@ -90,6 +90,10 @@ func NewAccountView(conf *config.AccountConfig,
return acct return acct
} }
func (acct *AccountView) Name() string {
return acct.conf.Name
}
func (acct *AccountView) Children() []ui.Drawable { func (acct *AccountView) Children() []ui.Drawable {
return acct.grid.Children() return acct.grid.Children()
} }
@ -173,6 +177,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
case *types.Done: case *types.Done:
switch msg.InResponseTo().(type) { switch msg.InResponseTo().(type) {
case *types.OpenDirectory: case *types.OpenDirectory:
acct.msglist.SetStore(nil)
acct.worker.PostAction(&types.FetchDirectoryContents{}, acct.worker.PostAction(&types.FetchDirectoryContents{},
func(msg types.WorkerMessage) { func(msg types.WorkerMessage) {
store := acct.msgStores[acct.dirlist.selected] store := acct.msgStores[acct.dirlist.selected]

View File

@ -16,6 +16,7 @@ type DirectoryList struct {
dirs []string dirs []string
logger *log.Logger logger *log.Logger
onInvalidate func(d ui.Drawable) onInvalidate func(d ui.Drawable)
selecting string
selected string selected string
spinner *Spinner spinner *Spinner
worker *types.Worker worker *types.Worker
@ -58,11 +59,24 @@ func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) {
} }
func (dirlist *DirectoryList) Select(name string) { func (dirlist *DirectoryList) Select(name string) {
dirlist.selected = name dirlist.selecting = name
dirlist.worker.PostAction(&types.OpenDirectory{Directory: name}, nil) dirlist.worker.PostAction(&types.OpenDirectory{Directory: name},
func(msg types.WorkerMessage) {
switch msg.(type) {
case *types.Error:
dirlist.selecting = ""
default:
dirlist.selected = dirlist.selecting
}
dirlist.Invalidate()
})
dirlist.Invalidate() dirlist.Invalidate()
} }
func (dirlist *DirectoryList) Selected() string {
return dirlist.selected
}
func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) { func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) {
dirlist.onInvalidate = onInvalidate dirlist.onInvalidate = onInvalidate
} }