From d3b62dd3b0fe6f5f1fb52e4fa9247cf9b27cbb3c Mon Sep 17 00:00:00 2001 From: Koni Marti Date: Mon, 3 Oct 2022 23:56:07 +0200 Subject: view: add peek flag and propagate Add a peek flag -p to the view commands to open the message viewer without setting the "seen" flag. If the flag is set, it would ignore the "auto-mark-read" config. The SetSeen flag will be propagated in case the message viewer moves on to other messages, i.e. with the delete or archive commands. Signed-off-by: Koni Marti Acked-by: Robin Jarry --- commands/account/view.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'commands/account') diff --git a/commands/account/view.go b/commands/account/view.go index be8b45e4..f30ac61b 100644 --- a/commands/account/view.go +++ b/commands/account/view.go @@ -5,6 +5,7 @@ import ( "git.sr.ht/~rjarry/aerc/lib" "git.sr.ht/~rjarry/aerc/widgets" + "git.sr.ht/~sircmpwn/getopt" ) type ViewMessage struct{} @@ -22,8 +23,20 @@ func (ViewMessage) Complete(aerc *widgets.Aerc, args []string) []string { } func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error { - if len(args) != 1 { - return errors.New("Usage: view-message") + peek := false + opts, optind, err := getopt.Getopts(args, "p") + if err != nil { + return err + } + + for _, opt := range opts { + if opt.Option == 'p' { + peek = true + } + } + + if len(args) != optind { + return errors.New("Usage: view-message [-p]") } acct := aerc.SelectedAccount() if acct == nil { @@ -45,7 +58,7 @@ func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error { aerc.PushError(msg.Error.Error()) return nil } - lib.NewMessageStoreView(msg, acct.UiConfig().AutoMarkRead, + lib.NewMessageStoreView(msg, !peek && acct.UiConfig().AutoMarkRead, store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { -- cgit