diff options
| -rw-r--r-- | commands/account/view.go | 19 | ||||
| -rw-r--r-- | commands/msg/archive.go | 2 | ||||
| -rw-r--r-- | commands/msg/delete.go | 2 | ||||
| -rw-r--r-- | commands/msgview/next.go | 2 | ||||
| -rw-r--r-- | doc/aerc.1.scd | 6 | ||||
| -rw-r--r-- | lib/messageview.go | 9 |
6 files changed, 32 insertions, 8 deletions
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 { diff --git a/commands/msg/archive.go b/commands/msg/archive.go index 2935991c..d485fd3d 100644 --- a/commands/msg/archive.go +++ b/commands/msg/archive.go @@ -120,7 +120,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error { acct.Messages().Invalidate() return } - lib.NewMessageStoreView(next, acct.UiConfig().AutoMarkRead, + lib.NewMessageStoreView(next, mv.MessageView().SeenFlagSet(), store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { diff --git a/commands/msg/delete.go b/commands/msg/delete.go index 57cef34d..a3d024a7 100644 --- a/commands/msg/delete.go +++ b/commands/msg/delete.go @@ -63,7 +63,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error { acct.Messages().Invalidate() return } - lib.NewMessageStoreView(next, acct.UiConfig().AutoMarkRead, + lib.NewMessageStoreView(next, mv.MessageView().SeenFlagSet(), store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { diff --git a/commands/msgview/next.go b/commands/msgview/next.go index b9e5dbda..6341f931 100644 --- a/commands/msgview/next.go +++ b/commands/msgview/next.go @@ -42,7 +42,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { aerc.RemoveTab(mv) return nil } - lib.NewMessageStoreView(nextMsg, acct.UiConfig().AutoMarkRead, + lib.NewMessageStoreView(nextMsg, mv.MessageView().SeenFlagSet(), store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd index 355a08d6..5898f21d 100644 --- a/doc/aerc.1.scd +++ b/doc/aerc.1.scd @@ -374,8 +374,10 @@ message list, the message in the message viewer, etc). *toggle-threads* Toggles between message threading and the normal message list. -*view* - Opens the message viewer to display the selected message. +*view* [-p] + Opens the message viewer to display the selected message. If the peek + flag -p is set, the message will not be marked as "seen" and ignores the + "auto-mark-read" config. ## MESSAGE VIEW COMMANDS diff --git a/lib/messageview.go b/lib/messageview.go index d774f4f3..e4f9cbeb 100644 --- a/lib/messageview.go +++ b/lib/messageview.go @@ -29,6 +29,9 @@ type MessageView interface { FetchBodyPart(part []int, cb func(io.Reader)) MessageDetails() *models.MessageDetails + + // SeenFlagSet returns true if the "seen" flag has been set + SeenFlagSet() bool } func usePGP(info *models.BodyStructure) bool { @@ -56,6 +59,7 @@ type MessageStoreView struct { message []byte details *models.MessageDetails bodyStructure *models.BodyStructure + setSeen bool } func NewMessageStoreView(messageInfo *models.MessageInfo, setSeen bool, @@ -65,6 +69,7 @@ func NewMessageStoreView(messageInfo *models.MessageInfo, setSeen bool, msv := &MessageStoreView{ messageInfo, store, nil, nil, messageInfo.BodyStructure, + setSeen, } if usePGP(messageInfo.BodyStructure) { @@ -102,6 +107,10 @@ func NewMessageStoreView(messageInfo *models.MessageInfo, setSeen bool, } } +func (msv *MessageStoreView) SeenFlagSet() bool { + return msv.setSeen +} + func (msv *MessageStoreView) MessageInfo() *models.MessageInfo { return msv.messageInfo } |