mirror of
https://git.sr.ht/~rjarry/aerc
synced 2025-12-12 20:36:12 +01:00
Since commit 1393344097 ("mod: update go-opt"), running :search or
:filter crashes with an obscure error:
panic: *account.SearchFilter.EndDate: unsupported field type: struct
goroutine 1 [running]:
git.sr.ht/~rjarry/aerc/lib/log.PanicHandler()
git.sr.ht/~rjarry/aerc/lib/log/panic-logger.go:51
panic({0x104ce89c0?, 0x14000032f00?})
runtime/panic.go:785
git.sr.ht/~rjarry/go-opt/v2.(*optSpec).parseField.func1(...)
git.sr.ht/~rjarry/go-opt/v2@v2.0.2/spec.go:149
git.sr.ht/~rjarry/go-opt/v2.(*optSpec).parseField(...)
git.sr.ht/~rjarry/go-opt/v2@v2.0.2/spec.go:186
git.sr.ht/~rjarry/go-opt/v2.NewCmdSpec(...)
git.sr.ht/~rjarry/go-opt/v2@v2.0.2/spec.go:111
git.sr.ht/~rjarry/go-opt/v2.ArgsToStruct(...)
git.sr.ht/~rjarry/go-opt/v2@v2.0.2/opt.go:147
git.sr.ht/~rjarry/aerc/commands.ExecuteCommand(...)
git.sr.ht/~rjarry/aerc/commands/commands.go:215
...
That error was fixed in go-opt.
Also, any argument starting with "-" is parsed as a flag or option and
never considered as a positional argument unless it is preceded by "--".
Lots of commands in aerc actually have positional arguments that need to
start with "-", such as:
:tag -label
:select -1
:prev-folder -100
For this, a new minus:"true" tag must be added to positional arguments
that may take values starting with "-".
Link: https://git.sr.ht/~rjarry/go-opt/commit/63f7bfa70ffe
Link: https://git.sr.ht/~rjarry/go-opt/commit/c5a75f147f24
Reported-by: Sebastien Binet <s@sbinet.org>
Reported-by: Vitaly Ovchinnikov <v@ovch.ru>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Tested-by: Inwit <inwit@sindominio.net>
61 lines
1.1 KiB
Go
61 lines
1.1 KiB
Go
package commands
|
|
|
|
import (
|
|
"errors"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"git.sr.ht/~rjarry/aerc/app"
|
|
)
|
|
|
|
type ChangeTab struct {
|
|
Tab string `opt:"tab" minus:"true" complete:"CompleteTab" desc:"Tab name."`
|
|
}
|
|
|
|
func init() {
|
|
Register(ChangeTab{})
|
|
}
|
|
|
|
func (ChangeTab) Description() string {
|
|
return "Change the focus to the specified tab."
|
|
}
|
|
|
|
func (ChangeTab) Context() CommandContext {
|
|
return GLOBAL
|
|
}
|
|
|
|
func (ChangeTab) Aliases() []string {
|
|
return []string{"ct", "change-tab"}
|
|
}
|
|
|
|
func (*ChangeTab) CompleteTab(arg string) []string {
|
|
return FilterList(app.TabNames(), arg, nil)
|
|
}
|
|
|
|
func (c ChangeTab) Execute(args []string) error {
|
|
if c.Tab == "-" {
|
|
ok := app.SelectPreviousTab()
|
|
if !ok {
|
|
return errors.New("No previous tab to return to")
|
|
}
|
|
} else {
|
|
n, err := strconv.Atoi(c.Tab)
|
|
if err == nil {
|
|
if strings.HasPrefix(c.Tab, "+") || strings.HasPrefix(c.Tab, "-") {
|
|
app.SelectTabAtOffset(n)
|
|
} else {
|
|
ok := app.SelectTabIndex(n)
|
|
if !ok {
|
|
return errors.New("No tab with that index")
|
|
}
|
|
}
|
|
} else {
|
|
ok := app.SelectTab(c.Tab)
|
|
if !ok {
|
|
return errors.New("No tab with that name")
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|