aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--commands/cd.go35
-rw-r--r--commands/commands.go7
-rw-r--r--widgets/account.go5
-rw-r--r--widgets/directories.go18
4 files changed, 59 insertions, 6 deletions
diff --git a/commands/cd.go b/commands/cd.go
new file mode 100644
index 00000000..e3a19536
--- /dev/null
+++ b/commands/cd.go
@@ -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
+}
diff --git a/commands/commands.go b/commands/commands.go
index 49a8b46e..2890cdd4 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -14,11 +14,10 @@ var (
commands map[string]AercCommand
)
-func init() {
- commands = make(map[string]AercCommand)
-}
-
func Register(name string, cmd AercCommand) {
+ if commands == nil {
+ commands = make(map[string]AercCommand)
+ }
commands[name] = cmd
}
diff --git a/widgets/account.go b/widgets/account.go
index 5747f4b8..d22b1c64 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -90,6 +90,10 @@ func NewAccountView(conf *config.AccountConfig,
return acct
}
+func (acct *AccountView) Name() string {
+ return acct.conf.Name
+}
+
func (acct *AccountView) Children() []ui.Drawable {
return acct.grid.Children()
}
@@ -173,6 +177,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
case *types.Done:
switch msg.InResponseTo().(type) {
case *types.OpenDirectory:
+ acct.msglist.SetStore(nil)
acct.worker.PostAction(&types.FetchDirectoryContents{},
func(msg types.WorkerMessage) {
store := acct.msgStores[acct.dirlist.selected]
diff --git a/widgets/directories.go b/widgets/directories.go
index ae31d297..d66ae1f5 100644
--- a/widgets/directories.go
+++ b/widgets/directories.go
@@ -16,6 +16,7 @@ type DirectoryList struct {
dirs []string
logger *log.Logger
onInvalidate func(d ui.Drawable)
+ selecting string
selected string
spinner *Spinner
worker *types.Worker
@@ -58,11 +59,24 @@ func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) {
}
func (dirlist *DirectoryList) Select(name string) {
- dirlist.selected = name
- dirlist.worker.PostAction(&types.OpenDirectory{Directory: name}, nil)
+ dirlist.selecting = name
+ 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()
}
+func (dirlist *DirectoryList) Selected() string {
+ return dirlist.selected
+}
+
func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) {
dirlist.onInvalidate = onInvalidate
}