1
0
Fork 0
mirror of https://git.sr.ht/~rjarry/aerc synced 2025-07-03 23:30:21 +02:00
aerc/commands/account/split.go
Robin Jarry 6c83f10135 commands: allow positional arguments starting with "-"
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>
2025-03-31 16:35:54 +02:00

82 lines
1.6 KiB
Go

package account
import (
"errors"
"strconv"
"strings"
"git.sr.ht/~rjarry/aerc/app"
"git.sr.ht/~rjarry/aerc/commands"
)
type Split struct {
Size int `opt:"n" minus:"true" required:"false" action:"ParseSize"`
Delta bool
}
func init() {
commands.Register(Split{})
}
func (Split) Description() string {
return "Split the message list with a preview pane."
}
func (Split) Context() commands.CommandContext {
return commands.MESSAGE_LIST
}
func (s *Split) ParseSize(arg string) error {
i, err := strconv.ParseInt(arg, 10, 64)
if err != nil {
return err
}
s.Size = int(i)
if strings.HasPrefix(arg, "+") || strings.HasPrefix(arg, "-") {
s.Delta = true
}
return nil
}
func (Split) Aliases() []string {
return []string{"split", "vsplit", "hsplit"}
}
func (s Split) Execute(args []string) error {
acct := app.SelectedAccount()
if acct == nil {
return errors.New("No account selected")
}
store := app.SelectedAccount().Store()
if store == nil {
return errors.New("Cannot perform action. Messages still loading")
}
if s.Size == 0 && acct.SplitSize() == 0 {
if args[0] == "split" || args[0] == "hsplit" {
s.Size = app.SelectedAccount().Messages().Height() / 4
} else {
s.Size = app.SelectedAccount().Messages().Width() / 2
}
}
if s.Delta {
acct.SetSplitSize(acct.SplitSize() + s.Size)
return nil
}
if s.Size == acct.SplitSize() {
// Repeated commands of the same size have the effect of
// toggling the split
s.Size = 0
}
if s.Size < 0 {
// Don't allow split to go negative
s.Size = 1
}
switch args[0] {
case "split", "hsplit":
acct.Split(s.Size)
case "vsplit":
acct.Vsplit(s.Size)
}
return nil
}