mirror of
https://git.sr.ht/~rjarry/aerc
synced 2025-07-01 03:30:21 +02: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>
72 lines
1.5 KiB
Go
72 lines
1.5 KiB
Go
package msg
|
|
|
|
import (
|
|
"time"
|
|
|
|
"git.sr.ht/~rjarry/aerc/app"
|
|
"git.sr.ht/~rjarry/aerc/commands"
|
|
"git.sr.ht/~rjarry/aerc/worker/types"
|
|
)
|
|
|
|
type ModifyLabels struct {
|
|
Labels []string `opt:"..." minus:"true" metavar:"[+-!]<label>" complete:"CompleteLabels" desc:"Message label."`
|
|
}
|
|
|
|
func init() {
|
|
commands.Register(ModifyLabels{})
|
|
}
|
|
|
|
func (ModifyLabels) Description() string {
|
|
return "Modify message labels."
|
|
}
|
|
|
|
func (ModifyLabels) Context() commands.CommandContext {
|
|
return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
|
|
}
|
|
|
|
func (ModifyLabels) Aliases() []string {
|
|
return []string{"modify-labels", "tag"}
|
|
}
|
|
|
|
func (*ModifyLabels) CompleteLabels(arg string) []string {
|
|
return commands.GetLabels(arg)
|
|
}
|
|
|
|
func (m ModifyLabels) Execute(args []string) error {
|
|
h := newHelper()
|
|
store, err := h.store()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
uids, err := h.markedOrSelectedUids()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var add, remove, toggle []string
|
|
for _, l := range m.Labels {
|
|
switch l[0] {
|
|
case '+':
|
|
add = append(add, l[1:])
|
|
case '-':
|
|
remove = append(remove, l[1:])
|
|
case '!':
|
|
toggle = append(toggle, l[1:])
|
|
default:
|
|
// if no operand is given assume add
|
|
add = append(add, l)
|
|
}
|
|
}
|
|
store.ModifyLabels(uids, add, remove, toggle, func(
|
|
msg types.WorkerMessage,
|
|
) {
|
|
switch msg := msg.(type) {
|
|
case *types.Done:
|
|
app.PushStatus("labels updated", 10*time.Second)
|
|
store.Marker().ClearVisualMark()
|
|
case *types.Error:
|
|
app.PushError(msg.Error.Error())
|
|
}
|
|
})
|
|
return nil
|
|
}
|