1
0
Fork 0
mirror of https://git.sr.ht/~rjarry/aerc synced 2025-07-03 06:30:22 +02:00
aerc/commands/account/next.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

108 lines
2.4 KiB
Go

package account
import (
"errors"
"fmt"
"strconv"
"strings"
"git.sr.ht/~rjarry/aerc/app"
"git.sr.ht/~rjarry/aerc/commands"
"git.sr.ht/~rjarry/aerc/lib"
"git.sr.ht/~rjarry/aerc/lib/ui"
"git.sr.ht/~rjarry/aerc/models"
"git.sr.ht/~rjarry/aerc/worker/types"
)
type NextPrevMsg struct {
Amount int `opt:"n" minus:"true" default:"1" metavar:"<n>[%]" action:"ParseAmount"`
Percent bool
}
func init() {
commands.Register(NextPrevMsg{})
}
func (NextPrevMsg) Description() string {
return "Select the next or previous message in the message list."
}
func (NextPrevMsg) Context() commands.CommandContext {
return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
}
func (np *NextPrevMsg) ParseAmount(arg string) error {
if strings.HasSuffix(arg, "%") {
np.Percent = true
arg = strings.TrimSuffix(arg, "%")
}
i, err := strconv.ParseInt(arg, 10, 64)
if err != nil {
return err
}
np.Amount = int(i)
return nil
}
func (NextPrevMsg) Aliases() []string {
return []string{"next", "next-message", "prev", "prev-message"}
}
func (np NextPrevMsg) Execute(args []string) error {
acct := app.SelectedAccount()
if acct == nil {
return errors.New("No account selected")
}
store := acct.Store()
if store == nil {
return fmt.Errorf("No message store set.")
}
n := np.Amount
if np.Percent {
n = int(float64(acct.Messages().Height()) * (float64(n) / 100.0))
}
if args[0] == "prev-message" || args[0] == "prev" {
store.NextPrev(-n)
} else {
store.NextPrev(n)
}
if mv, ok := app.SelectedTabContent().(*app.MessageViewer); ok {
reloadViewer := func(nextMsg *models.MessageInfo) {
if nextMsg.Error != nil {
app.PushError(nextMsg.Error.Error())
return
}
lib.NewMessageStoreView(nextMsg, mv.MessageView().SeenFlagSet(),
store, app.CryptoProvider(), app.DecryptKeys,
func(view lib.MessageView, err error) {
if err != nil {
app.PushError(err.Error())
return
}
nextMv, err := app.NewMessageViewer(acct, view)
if err != nil {
app.PushError(err.Error())
return
}
app.ReplaceTab(mv, nextMv,
nextMsg.Envelope.Subject, true)
})
}
if nextMsg := store.Selected(); nextMsg != nil {
reloadViewer(nextMsg)
} else {
store.FetchHeaders([]models.UID{store.SelectedUid()},
func(msg types.WorkerMessage) {
if m, ok := msg.(*types.MessageInfo); ok {
reloadViewer(m.Info)
}
})
}
}
ui.Invalidate()
return nil
}