From 753adb90692e4821f8caea1d5d86cd69e312efa7 Mon Sep 17 00:00:00 2001 From: Kevin Kuehler Date: Sat, 1 Jun 2019 22:15:04 -0700 Subject: widget: Add ProvidesMessage interface Consists of 3 functions * Store: Access to MessageStore type * SelectedAccount: Access to Account widget that the target widget belongs to * SelectedMessage: Current message (selected in msglist or the one we are viewing) Signed-off-by: Kevin Kuehler --- aerc.go | 3 + commands/account/copy.go | 38 ------- commands/account/delete.go | 39 ------- commands/account/move.go | 39 ------- commands/account/reply.go | 253 -------------------------------------------- commands/account/view.go | 2 +- commands/msg/copy.go | 39 +++++++ commands/msg/delete.go | 45 ++++++++ commands/msg/move.go | 44 ++++++++ commands/msg/msg.go | 16 +++ commands/msg/reply.go | 257 +++++++++++++++++++++++++++++++++++++++++++++ widgets/account.go | 12 +++ widgets/msgviewer.go | 16 ++- widgets/providesmessage.go | 14 +++ 14 files changed, 446 insertions(+), 371 deletions(-) delete mode 100644 commands/account/copy.go delete mode 100644 commands/account/delete.go delete mode 100644 commands/account/move.go delete mode 100644 commands/account/reply.go create mode 100644 commands/msg/copy.go create mode 100644 commands/msg/delete.go create mode 100644 commands/msg/move.go create mode 100644 commands/msg/msg.go create mode 100644 commands/msg/reply.go create mode 100644 widgets/providesmessage.go diff --git a/aerc.go b/aerc.go index 22df069..ffce931 100644 --- a/aerc.go +++ b/aerc.go @@ -13,6 +13,7 @@ import ( "git.sr.ht/~sircmpwn/aerc/commands" "git.sr.ht/~sircmpwn/aerc/commands/account" "git.sr.ht/~sircmpwn/aerc/commands/compose" + "git.sr.ht/~sircmpwn/aerc/commands/msg" "git.sr.ht/~sircmpwn/aerc/commands/msgview" "git.sr.ht/~sircmpwn/aerc/commands/terminal" "git.sr.ht/~sircmpwn/aerc/config" @@ -25,6 +26,7 @@ func getCommands(selected libui.Drawable) []*commands.Commands { case *widgets.AccountView: return []*commands.Commands{ account.AccountCommands, + msg.MessageCommands, commands.GlobalCommands, } case *widgets.Composer: @@ -35,6 +37,7 @@ func getCommands(selected libui.Drawable) []*commands.Commands { case *widgets.MessageViewer: return []*commands.Commands{ msgview.MessageViewCommands, + msg.MessageCommands, commands.GlobalCommands, } case *widgets.Terminal: diff --git a/commands/account/copy.go b/commands/account/copy.go deleted file mode 100644 index da26fec..0000000 --- a/commands/account/copy.go +++ /dev/null @@ -1,38 +0,0 @@ -package account - -import ( - "errors" - "time" - - "github.com/gdamore/tcell" - - "git.sr.ht/~sircmpwn/aerc/widgets" - "git.sr.ht/~sircmpwn/aerc/worker/types" -) - -func init() { - register("cp", Copy) - register("copy", Copy) -} - -func Copy(aerc *widgets.Aerc, args []string) error { - if len(args) != 2 { - return errors.New("Usage: mv ") - } - acct := aerc.SelectedAccount() - if acct == nil { - return errors.New("No account selected") - } - msg := acct.Messages().Selected() - store := acct.Messages().Store() - store.Copy([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { - switch msg := msg.(type) { - case *types.Done: - aerc.PushStatus("Messages copied.", 10*time.Second) - case *types.Error: - aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) - } - }) - return nil -} diff --git a/commands/account/delete.go b/commands/account/delete.go deleted file mode 100644 index 65d6eb9..0000000 --- a/commands/account/delete.go +++ /dev/null @@ -1,39 +0,0 @@ -package account - -import ( - "errors" - "time" - - "github.com/gdamore/tcell" - - "git.sr.ht/~sircmpwn/aerc/widgets" - "git.sr.ht/~sircmpwn/aerc/worker/types" -) - -func init() { - register("delete", DeleteMessage) - register("delete-message", DeleteMessage) -} - -func DeleteMessage(aerc *widgets.Aerc, args []string) error { - if len(args) != 1 { - return errors.New("Usage: :delete") - } - acct := aerc.SelectedAccount() - if acct == nil { - return errors.New("No account selected") - } - store := acct.Messages().Store() - msg := acct.Messages().Selected() - acct.Messages().Next() - store.Delete([]uint32{msg.Uid}, func(msg types.WorkerMessage) { - switch msg := msg.(type) { - case *types.Done: - aerc.PushStatus("Messages deleted.", 10*time.Second) - case *types.Error: - aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) - } - }) - return nil -} diff --git a/commands/account/move.go b/commands/account/move.go deleted file mode 100644 index d58a279..0000000 --- a/commands/account/move.go +++ /dev/null @@ -1,39 +0,0 @@ -package account - -import ( - "errors" - "time" - - "github.com/gdamore/tcell" - - "git.sr.ht/~sircmpwn/aerc/widgets" - "git.sr.ht/~sircmpwn/aerc/worker/types" -) - -func init() { - register("mv", Move) - register("move", Move) -} - -func Move(aerc *widgets.Aerc, args []string) error { - if len(args) != 2 { - return errors.New("Usage: mv ") - } - acct := aerc.SelectedAccount() - if acct == nil { - return errors.New("No account selected") - } - msg := acct.Messages().Selected() - store := acct.Messages().Store() - acct.Messages().Next() - store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { - switch msg := msg.(type) { - case *types.Done: - aerc.PushStatus("Messages moved.", 10*time.Second) - case *types.Error: - aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) - } - }) - return nil -} diff --git a/commands/account/reply.go b/commands/account/reply.go deleted file mode 100644 index ecc6239..0000000 --- a/commands/account/reply.go +++ /dev/null @@ -1,253 +0,0 @@ -package account - -import ( - "bufio" - "errors" - "fmt" - "io" - gomail "net/mail" - "regexp" - "strings" - - "git.sr.ht/~sircmpwn/getopt" - "github.com/emersion/go-imap" - "github.com/emersion/go-message" - _ "github.com/emersion/go-message/charset" - "github.com/emersion/go-message/mail" - - "git.sr.ht/~sircmpwn/aerc/widgets" -) - -func init() { - register("reply", Reply) - register("forward", Reply) -} - -var ( - atom *regexp.Regexp = regexp.MustCompile("^[a-z0-9!#$%7'*+-/=?^_`{}|~ ]+$") -) - -func formatAddress(addr *imap.Address) string { - if addr.PersonalName != "" { - if atom.MatchString(addr.PersonalName) { - return fmt.Sprintf("%s <%s@%s>", - addr.PersonalName, addr.MailboxName, addr.HostName) - } else { - return fmt.Sprintf("\"%s\" <%s@%s>", - strings.ReplaceAll(addr.PersonalName, "\"", "'"), - addr.MailboxName, addr.HostName) - } - } else { - return fmt.Sprintf("<%s@%s>", addr.MailboxName, addr.HostName) - } -} - -func Reply(aerc *widgets.Aerc, args []string) error { - opts, optind, err := getopt.Getopts(args[1:], "aq") - if err != nil { - return err - } - if optind != len(args)-1 { - return errors.New("Usage: reply [-aq]") - } - var ( - quote bool - replyAll bool - ) - for _, opt := range opts { - switch opt.Option { - case 'a': - replyAll = true - case 'q': - quote = true - } - } - - acct := aerc.SelectedAccount() - conf := acct.AccountConfig() - us, _ := gomail.ParseAddress(conf.From) - store := acct.Messages().Store() - msg := acct.Messages().Selected() - acct.Logger().Println("Replying to email " + msg.Envelope.MessageId) - - var ( - to []string - cc []string - toList []*imap.Address - ) - if args[0] == "reply" { - if len(msg.Envelope.ReplyTo) != 0 { - toList = msg.Envelope.ReplyTo - } else { - toList = msg.Envelope.From - } - for _, addr := range toList { - if addr.PersonalName != "" { - to = append(to, fmt.Sprintf("%s <%s@%s>", - addr.PersonalName, addr.MailboxName, addr.HostName)) - } else { - to = append(to, fmt.Sprintf("<%s@%s>", - addr.MailboxName, addr.HostName)) - } - } - if replyAll { - for _, addr := range msg.Envelope.Cc { - cc = append(cc, formatAddress(addr)) - } - for _, addr := range msg.Envelope.To { - address := fmt.Sprintf("%s@%s", addr.MailboxName, addr.HostName) - if address == us.Address { - continue - } - to = append(to, formatAddress(addr)) - } - } - } - - var subject string - if args[0] == "forward" { - subject = "Fwd: " + msg.Envelope.Subject - } else { - if !strings.HasPrefix(msg.Envelope.Subject, "Re: ") { - subject = "Re: " + msg.Envelope.Subject - } else { - subject = msg.Envelope.Subject - } - } - - composer := widgets.NewComposer( - aerc.Config(), acct.AccountConfig(), acct.Worker()). - Defaults(map[string]string{ - "To": strings.Join(to, ", "), - "Cc": strings.Join(cc, ", "), - "Subject": subject, - "In-Reply-To": msg.Envelope.MessageId, - }) - - if args[0] == "reply" { - composer.FocusTerminal() - } - - addTab := func() { - tab := aerc.NewTab(composer, subject) - composer.OnSubjectChange(func(subject string) { - if subject == "" { - tab.Name = "New email" - } else { - tab.Name = subject - } - tab.Content.Invalidate() - }) - } - - if args[0] == "forward" { - // TODO: something more intelligent than fetching the 1st part - // TODO: add attachments! - store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) { - header := message.Header{} - header.SetText( - "Content-Transfer-Encoding", msg.BodyStructure.Encoding) - header.SetContentType( - msg.BodyStructure.MIMEType, msg.BodyStructure.Params) - header.SetText("Content-Description", msg.BodyStructure.Description) - entity, err := message.New(header, reader) - if err != nil { - // TODO: Do something with the error - addTab() - return - } - mreader := mail.NewReader(entity) - part, err := mreader.NextPart() - if err != nil { - // TODO: Do something with the error - addTab() - return - } - - pipeout, pipein := io.Pipe() - scanner := bufio.NewScanner(part.Body) - go composer.SetContents(pipeout) - // TODO: Let user customize the date format used here - io.WriteString(pipein, fmt.Sprintf("Forwarded message from %s on %s:\n\n", - msg.Envelope.From[0].PersonalName, - msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"))) - for scanner.Scan() { - io.WriteString(pipein, fmt.Sprintf("%s\n", scanner.Text())) - } - pipein.Close() - pipeout.Close() - addTab() - }) - } else { - if quote { - var ( - path []int - part *imap.BodyStructure - ) - if len(msg.BodyStructure.Parts) != 0 { - part, path = findPlaintext(msg.BodyStructure, path) - } - if part == nil { - part = msg.BodyStructure - path = []int{1} - } - - store.FetchBodyPart(msg.Uid, path, func(reader io.Reader) { - header := message.Header{} - header.SetText( - "Content-Transfer-Encoding", part.Encoding) - header.SetContentType(part.MIMEType, part.Params) - header.SetText("Content-Description", part.Description) - entity, err := message.New(header, reader) - if err != nil { - // TODO: Do something with the error - addTab() - return - } - mreader := mail.NewReader(entity) - part, err := mreader.NextPart() - if err != nil { - // TODO: Do something with the error - addTab() - return - } - - pipeout, pipein := io.Pipe() - scanner := bufio.NewScanner(part.Body) - go composer.SetContents(pipeout) - // TODO: Let user customize the date format used here - io.WriteString(pipein, fmt.Sprintf("On %s %s wrote:\n", - msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"), - msg.Envelope.From[0].PersonalName)) - for scanner.Scan() { - io.WriteString(pipein, fmt.Sprintf("> %s\n", scanner.Text())) - } - pipein.Close() - pipeout.Close() - addTab() - }) - } else { - addTab() - } - } - - return nil -} - -func findPlaintext(bs *imap.BodyStructure, - path []int) (*imap.BodyStructure, []int) { - - for i, part := range bs.Parts { - cur := append(path, i+1) - if part.MIMEType == "text" && part.MIMESubType == "plain" { - return part, cur - } - if part.MIMEType == "multipart" { - if part, path := findPlaintext(part, cur); path != nil { - return part, path - } - } - } - - return nil, nil -} diff --git a/commands/account/view.go b/commands/account/view.go index 40abec3..f7f3ec6 100644 --- a/commands/account/view.go +++ b/commands/account/view.go @@ -24,7 +24,7 @@ func ViewMessage(aerc *widgets.Aerc, args []string) error { if msg == nil { return nil } - viewer := widgets.NewMessageViewer(aerc.Config(), store, msg) + viewer := widgets.NewMessageViewer(acct, aerc.Config(), store, msg) aerc.NewTab(viewer, msg.Envelope.Subject) return nil } diff --git a/commands/msg/copy.go b/commands/msg/copy.go new file mode 100644 index 0000000..57c93a3 --- /dev/null +++ b/commands/msg/copy.go @@ -0,0 +1,39 @@ +package msg + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" +) + +func init() { + register("cp", Copy) + register("copy", Copy) +} + +func Copy(aerc *widgets.Aerc, args []string) error { + if len(args) != 2 { + return errors.New("Usage: mv ") + } + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + msg := widget.SelectedMessage() + store := widget.Store() + store.Copy([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages copied.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/commands/msg/delete.go b/commands/msg/delete.go new file mode 100644 index 0000000..082dbe3 --- /dev/null +++ b/commands/msg/delete.go @@ -0,0 +1,45 @@ +package msg + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" +) + +func init() { + register("delete", DeleteMessage) + register("delete-message", DeleteMessage) +} + +func DeleteMessage(aerc *widgets.Aerc, args []string) error { + if len(args) != 1 { + return errors.New("Usage: :delete") + } + + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + store := widget.Store() + msg := widget.SelectedMessage() + _, isMsgView := widget.(*widgets.MessageViewer) + if isMsgView { + aerc.RemoveTab(widget) + } + acct.Messages().Next() + store.Delete([]uint32{msg.Uid}, func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages deleted.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/commands/msg/move.go b/commands/msg/move.go new file mode 100644 index 0000000..1224efa --- /dev/null +++ b/commands/msg/move.go @@ -0,0 +1,44 @@ +package msg + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" +) + +func init() { + register("mv", Move) + register("move", Move) +} + +func Move(aerc *widgets.Aerc, args []string) error { + if len(args) != 2 { + return errors.New("Usage: mv ") + } + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + msg := widget.SelectedMessage() + store := widget.Store() + _, isMsgView := widget.(*widgets.MessageViewer) + if isMsgView { + aerc.RemoveTab(widget) + } + acct.Messages().Next() + store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages moved.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/commands/msg/msg.go b/commands/msg/msg.go new file mode 100644 index 0000000..73755aa --- /dev/null +++ b/commands/msg/msg.go @@ -0,0 +1,16 @@ +package msg + +import ( + "git.sr.ht/~sircmpwn/aerc/commands" +) + +var ( + MessageCommands *commands.Commands +) + +func register(name string, cmd commands.AercCommand) { + if MessageCommands == nil { + MessageCommands = commands.NewCommands() + } + MessageCommands.Register(name, cmd) +} diff --git a/commands/msg/reply.go b/commands/msg/reply.go new file mode 100644 index 0000000..e09a118 --- /dev/null +++ b/commands/msg/reply.go @@ -0,0 +1,257 @@ +package msg + +import ( + "bufio" + "errors" + "fmt" + "io" + gomail "net/mail" + "regexp" + "strings" + + "git.sr.ht/~sircmpwn/getopt" + "github.com/emersion/go-imap" + "github.com/emersion/go-message" + _ "github.com/emersion/go-message/charset" + "github.com/emersion/go-message/mail" + + "git.sr.ht/~sircmpwn/aerc/widgets" +) + +func init() { + register("reply", Reply) + register("forward", Reply) +} + +var ( + atom *regexp.Regexp = regexp.MustCompile("^[a-z0-9!#$%7'*+-/=?^_`{}|~ ]+$") +) + +func formatAddress(addr *imap.Address) string { + if addr.PersonalName != "" { + if atom.MatchString(addr.PersonalName) { + return fmt.Sprintf("%s <%s@%s>", + addr.PersonalName, addr.MailboxName, addr.HostName) + } else { + return fmt.Sprintf("\"%s\" <%s@%s>", + strings.ReplaceAll(addr.PersonalName, "\"", "'"), + addr.MailboxName, addr.HostName) + } + } else { + return fmt.Sprintf("<%s@%s>", addr.MailboxName, addr.HostName) + } +} + +func Reply(aerc *widgets.Aerc, args []string) error { + opts, optind, err := getopt.Getopts(args[1:], "aq") + if err != nil { + return err + } + if optind != len(args)-1 { + return errors.New("Usage: reply [-aq]") + } + var ( + quote bool + replyAll bool + ) + for _, opt := range opts { + switch opt.Option { + case 'a': + replyAll = true + case 'q': + quote = true + } + } + + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + conf := acct.AccountConfig() + us, _ := gomail.ParseAddress(conf.From) + store := widget.Store() + msg := widget.SelectedMessage() + acct.Logger().Println("Replying to email " + msg.Envelope.MessageId) + + var ( + to []string + cc []string + toList []*imap.Address + ) + if args[0] == "reply" { + if len(msg.Envelope.ReplyTo) != 0 { + toList = msg.Envelope.ReplyTo + } else { + toList = msg.Envelope.From + } + for _, addr := range toList { + if addr.PersonalName != "" { + to = append(to, fmt.Sprintf("%s <%s@%s>", + addr.PersonalName, addr.MailboxName, addr.HostName)) + } else { + to = append(to, fmt.Sprintf("<%s@%s>", + addr.MailboxName, addr.HostName)) + } + } + if replyAll { + for _, addr := range msg.Envelope.Cc { + cc = append(cc, formatAddress(addr)) + } + for _, addr := range msg.Envelope.To { + address := fmt.Sprintf("%s@%s", addr.MailboxName, addr.HostName) + if address == us.Address { + continue + } + to = append(to, formatAddress(addr)) + } + } + } + + var subject string + if args[0] == "forward" { + subject = "Fwd: " + msg.Envelope.Subject + } else { + if !strings.HasPrefix(msg.Envelope.Subject, "Re: ") { + subject = "Re: " + msg.Envelope.Subject + } else { + subject = msg.Envelope.Subject + } + } + + composer := widgets.NewComposer( + aerc.Config(), acct.AccountConfig(), acct.Worker()). + Defaults(map[string]string{ + "To": strings.Join(to, ", "), + "Cc": strings.Join(cc, ", "), + "Subject": subject, + "In-Reply-To": msg.Envelope.MessageId, + }) + + if args[0] == "reply" { + composer.FocusTerminal() + } + + addTab := func() { + tab := aerc.NewTab(composer, subject) + composer.OnSubjectChange(func(subject string) { + if subject == "" { + tab.Name = "New email" + } else { + tab.Name = subject + } + tab.Content.Invalidate() + }) + } + + if args[0] == "forward" { + // TODO: something more intelligent than fetching the 1st part + // TODO: add attachments! + store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) { + header := message.Header{} + header.SetText( + "Content-Transfer-Encoding", msg.BodyStructure.Encoding) + header.SetContentType( + msg.BodyStructure.MIMEType, msg.BodyStructure.Params) + header.SetText("Content-Description", msg.BodyStructure.Description) + entity, err := message.New(header, reader) + if err != nil { + // TODO: Do something with the error + addTab() + return + } + mreader := mail.NewReader(entity) + part, err := mreader.NextPart() + if err != nil { + // TODO: Do something with the error + addTab() + return + } + + pipeout, pipein := io.Pipe() + scanner := bufio.NewScanner(part.Body) + go composer.SetContents(pipeout) + // TODO: Let user customize the date format used here + io.WriteString(pipein, fmt.Sprintf("Forwarded message from %s on %s:\n\n", + msg.Envelope.From[0].PersonalName, + msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"))) + for scanner.Scan() { + io.WriteString(pipein, fmt.Sprintf("%s\n", scanner.Text())) + } + pipein.Close() + pipeout.Close() + addTab() + }) + } else { + if quote { + var ( + path []int + part *imap.BodyStructure + ) + if len(msg.BodyStructure.Parts) != 0 { + part, path = findPlaintext(msg.BodyStructure, path) + } + if part == nil { + part = msg.BodyStructure + path = []int{1} + } + + store.FetchBodyPart(msg.Uid, path, func(reader io.Reader) { + header := message.Header{} + header.SetText( + "Content-Transfer-Encoding", part.Encoding) + header.SetContentType(part.MIMEType, part.Params) + header.SetText("Content-Description", part.Description) + entity, err := message.New(header, reader) + if err != nil { + // TODO: Do something with the error + addTab() + return + } + mreader := mail.NewReader(entity) + part, err := mreader.NextPart() + if err != nil { + // TODO: Do something with the error + addTab() + return + } + + pipeout, pipein := io.Pipe() + scanner := bufio.NewScanner(part.Body) + go composer.SetContents(pipeout) + // TODO: Let user customize the date format used here + io.WriteString(pipein, fmt.Sprintf("On %s %s wrote:\n", + msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"), + msg.Envelope.From[0].PersonalName)) + for scanner.Scan() { + io.WriteString(pipein, fmt.Sprintf("> %s\n", scanner.Text())) + } + pipein.Close() + pipeout.Close() + addTab() + }) + } else { + addTab() + } + } + + return nil +} + +func findPlaintext(bs *imap.BodyStructure, + path []int) (*imap.BodyStructure, []int) { + + for i, part := range bs.Parts { + cur := append(path, i+1) + if part.MIMEType == "text" && part.MIMESubType == "plain" { + return part, cur + } + if part.MIMEType == "multipart" { + if part, path := findPlaintext(part, cur); path != nil { + return part, path + } + } + } + + return nil, nil +} diff --git a/widgets/account.go b/widgets/account.go index f553a92..4526c02 100644 --- a/widgets/account.go +++ b/widgets/account.go @@ -157,6 +157,18 @@ func (acct *AccountView) Messages() *MessageList { return acct.msglist } +func (acct *AccountView) Store() *lib.MessageStore { + return acct.msglist.Store() +} + +func (acct *AccountView) SelectedMessage() *types.MessageInfo { + return acct.msglist.Selected() +} + +func (acct *AccountView) SelectedAccount() *AccountView { + return acct +} + func (acct *AccountView) onMessage(msg types.WorkerMessage) { switch msg := msg.(type) { case *types.Done: diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index cf360bc..9230ba3 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -24,6 +24,7 @@ import ( type MessageViewer struct { ui.Invalidatable + acct *AccountView conf *config.AercConfig err error grid *ui.Grid @@ -55,7 +56,7 @@ func formatAddresses(addrs []*imap.Address) string { return val.String() } -func NewMessageViewer(conf *config.AercConfig, +func NewMessageViewer(acct *AccountView, conf *config.AercConfig, store *lib.MessageStore, msg *types.MessageInfo) *MessageViewer { grid := ui.NewGrid().Rows([]ui.GridSpec{ @@ -124,6 +125,7 @@ func NewMessageViewer(conf *config.AercConfig, grid.AddChild(switcher).At(1, 0) return &MessageViewer{ + acct: acct, grid: grid, msg: msg, store: store, @@ -185,6 +187,18 @@ func (mv *MessageViewer) OnInvalidate(fn func(d ui.Drawable)) { }) } +func (mv *MessageViewer) Store() *lib.MessageStore { + return mv.store +} + +func (mv *MessageViewer) SelectedAccount() *AccountView { + return mv.acct +} + +func (mv *MessageViewer) SelectedMessage() *types.MessageInfo { + return mv.msg +} + func (mv *MessageViewer) CurrentPart() *PartInfo { switcher := mv.switcher part := switcher.parts[switcher.selected] diff --git a/widgets/providesmessage.go b/widgets/providesmessage.go new file mode 100644 index 0000000..341f83f --- /dev/null +++ b/widgets/providesmessage.go @@ -0,0 +1,14 @@ +package widgets + +import ( + "git.sr.ht/~sircmpwn/aerc/worker/types" + "git.sr.ht/~sircmpwn/aerc/lib" + "git.sr.ht/~sircmpwn/aerc/lib/ui" +) + +type ProvidesMessage interface { + ui.Drawable + Store() *lib.MessageStore + SelectedMessage() *types.MessageInfo + SelectedAccount() *AccountView +} -- cgit 1.4.1-2-gfad0 ef='/akkartik/mu/commit/mu.vim?h=hlt&id=458ee5e354fa55e770696fb19054d4c6bb60ead6'>458ee5e3 ^ 
e82dc626 ^

f0c55e6b ^


816ffe20 ^

458ee5e3 ^

f0c55e6b ^

458ee5e3 ^

b085378e ^

f0c55e6b ^


458ee5e3 ^

b38d7fff ^


1
2
3
4
5
6

7
8

9

10
11
12
13

14
15
16
17
18
19
20

21
22

23

24

25

26
27
28
29

30

31

32

33

34

35

36

37

38

39

40

41

42

43
44
45

46

47

48

49

50

51

52

53

54
55
56

57

58

59

60

61

62
63
64

65

66

67

68

69

70
71
72

73
74
75
76

77
78
79
80
81
82

83
84

85

86

87
88

89

90

91

92

93

94
95

96

97
98