diff options
Diffstat (limited to 'commands/account/clear.go')
| -rw-r--r-- | commands/account/clear.go | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/commands/account/clear.go b/commands/account/clear.go index a383b621..0990cd39 100644 --- a/commands/account/clear.go +++ b/commands/account/clear.go @@ -5,10 +5,11 @@ import ( "git.sr.ht/~rjarry/aerc/lib/state" "git.sr.ht/~rjarry/aerc/widgets" - "git.sr.ht/~sircmpwn/getopt" ) -type Clear struct{} +type Clear struct { + Selected bool `opt:"-s"` +} func init() { register(Clear{}) @@ -22,7 +23,7 @@ func (Clear) Complete(aerc *widgets.Aerc, args []string) []string { return nil } -func (Clear) Execute(aerc *widgets.Aerc, args []string) error { +func (c Clear) Execute(aerc *widgets.Aerc, args []string) error { acct := aerc.SelectedAccount() if acct == nil { return errors.New("No account selected") @@ -32,23 +33,7 @@ func (Clear) Execute(aerc *widgets.Aerc, args []string) error { return errors.New("Cannot perform action. Messages still loading") } - clearSelected := false - opts, optind, err := getopt.Getopts(args, "s") - if err != nil { - return err - } - - for _, opt := range opts { - if opt.Option == 's' { - clearSelected = true - } - } - - if len(args) != optind { - return errors.New("Usage: clear [-s]") - } - - if clearSelected { + if c.Selected { defer store.Select(0) } store.ApplyClear() |