blacklight
/
aerc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make :pipe command more generic

This commit is contained in:
Drew DeVault 2019-07-05 12:21:12 -04:00
parent f9f523ad59
commit 363aab5cc1
8 changed files with 125 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
commands/account/pipe.go
View File

@ -1,42 +0,0 @@
package account
import (
"errors"
"io"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
)
type Pipe struct{}
func init() {
register(Pipe{})
}
func (_ Pipe) Aliases() []string {
return []string{"pipe"}
}
func (_ Pipe) Complete(aerc *widgets.Aerc, args []string) []string {
return nil
}
func (_ Pipe) Execute(aerc *widgets.Aerc, args []string) error {
if len(args) < 2 {
return errors.New("Usage: :pipe <cmd> [args...]")
}
acct := aerc.SelectedAccount()
store := acct.Messages().Store()
msg := acct.Messages().Selected()
store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
term, err := commands.QuickTerm(aerc, args[1:], reader)
if err != nil {
aerc.PushError(" " + err.Error())
return
}
name := args[1] + " <" + msg.Envelope.Subject
aerc.NewTab(term, name)
})
return nil
}

105
commands/msg/pipe.go Normal file
View File

@ -0,0 +1,105 @@
package msg
import (
"encoding/base64"
"errors"
"fmt"
"io"
"mime/quotedprintable"
"strings"
"git.sr.ht/~sircmpwn/getopt"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
)
type Pipe struct{}
func init() {
register(Pipe{})
}
func (_ Pipe) Aliases() []string {
return []string{"pipe"}
}
func (_ Pipe) Complete(aerc *widgets.Aerc, args []string) []string {
return nil
}
func (_ Pipe) Execute(aerc *widgets.Aerc, args []string) error {
var (
pipeFull bool
pipePart bool
)
// TODO: let user specify part by index or preferred mimetype
opts, optind, err := getopt.Getopts(args, "mp")
if err != nil {
return err
}
for _, opt := range opts {
switch opt.Option {
case 'm':
if pipePart {
return errors.New("-m and -p are mutually exclusive")
}
pipeFull = true
case 'p':
if pipeFull {
return errors.New("-m and -p are mutually exclusive")
}
pipePart = true
}
}
cmd := args[optind:]
if len(cmd) == 0 {
return errors.New("Usage: pipe [-mp] <cmd> [args...]")
}
provider := aerc.SelectedTab().(widgets.ProvidesMessage)
if !pipeFull && !pipePart {
if _, ok := provider.(*widgets.MessageViewer); ok {
pipePart = true
} else if _, ok := provider.(*widgets.AccountView); ok {
pipeFull = true
} else {
return errors.New(
"Neither -m nor -p specified and cannot infer default")
}
}
if pipeFull {
store := provider.Store()
msg := provider.SelectedMessage()
store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
term, err := commands.QuickTerm(aerc, cmd, reader)
if err != nil {
aerc.PushError(" " + err.Error())
return
}
name := cmd[0] + " <" + msg.Envelope.Subject
aerc.NewTab(term, name)
})
} else if pipePart {
p := provider.SelectedMessagePart()
p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
// email parts are encoded as 7bit (plaintext), quoted-printable, or base64
if strings.EqualFold(p.Part.Encoding, "base64") {
reader = base64.NewDecoder(base64.StdEncoding, reader)
} else if strings.EqualFold(p.Part.Encoding, "quoted-printable") {
reader = quotedprintable.NewReader(reader)
}
term, err := commands.QuickTerm(aerc, cmd, reader)
if err != nil {
aerc.PushError(" " + err.Error())
return
}
name := fmt.Sprintf("%s <%s/[%d]", cmd[0], p.Msg.Envelope.Subject, p.Index)
aerc.NewTab(term, name)
})
}
return nil
}

2
commands/msgview/open.go
View File

@ -34,7 +34,7 @@ func (_ Open) Execute(aerc *widgets.Aerc, args []string) error {
}
mv := aerc.SelectedTab().(*widgets.MessageViewer)
p := mv.CurrentPart()
p := mv.SelectedMessagePart()
p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
// email parts are encoded as 7bit (plaintext), quoted-printable, or base64

55
commands/msgview/pipe.go
View File

@ -1,55 +0,0 @@
package msgview
import (
"encoding/base64"
"errors"
"fmt"
"io"
"mime/quotedprintable"
"strings"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
)
type Pipe struct{}
func init() {
register(Pipe{})
}
func (_ Pipe) Aliases() []string {
return []string{"pipe"}
}
func (_ Pipe) Complete(aerc *widgets.Aerc, args []string) []string {
return nil
}
func (_ Pipe) Execute(aerc *widgets.Aerc, args []string) error {
if len(args) < 2 {
return errors.New("Usage: :pipe <cmd> [args...]")
}
mv := aerc.SelectedTab().(*widgets.MessageViewer)
p := mv.CurrentPart()
p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
// email parts are encoded as 7bit (plaintext), quoted-printable, or base64
if strings.EqualFold(p.Part.Encoding, "base64") {
reader = base64.NewDecoder(base64.StdEncoding, reader)
} else if strings.EqualFold(p.Part.Encoding, "quoted-printable") {
reader = quotedprintable.NewReader(reader)
}
term, err := commands.QuickTerm(aerc, args[1:], reader)
if err != nil {
aerc.PushError(" " + err.Error())
return
}
name := fmt.Sprintf("%s <%s/[%d]", args[1], p.Msg.Envelope.Subject, p.Index)
aerc.NewTab(term, name)
})
return nil
}

2
commands/msgview/save.go
View File

@ -56,7 +56,7 @@ func (_ Save) Execute(aerc *widgets.Aerc, args []string) error {
}
mv := aerc.SelectedTab().(*widgets.MessageViewer)
p := mv.CurrentPart()
p := mv.SelectedMessagePart()
p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
// email parts are encoded as 7bit (plaintext), quoted-printable, or base64

8
widgets/account.go
View File

@ -165,12 +165,16 @@ func (acct *AccountView) Store() *lib.MessageStore {
return acct.msglist.Store()
}
func (acct *AccountView) SelectedAccount() *AccountView {
return acct
}
func (acct *AccountView) SelectedMessage() *types.MessageInfo {
return acct.msglist.Selected()
}
func (acct *AccountView) SelectedAccount() *AccountView {
return acct
func (acct *AccountView) SelectedMessagePart() *PartInfo {
return nil
}
func (acct *AccountView) onMessage(msg types.WorkerMessage) {

9
widgets/msgviewer.go
View File

@ -227,7 +227,7 @@ func (mv *MessageViewer) ToggleHeaders() {
switcher.Invalidate()
}
func (mv *MessageViewer) CurrentPart() *PartInfo {
func (mv *MessageViewer) SelectedMessagePart() *PartInfo {
switcher := mv.switcher
part := switcher.parts[switcher.selected]
@ -332,13 +332,6 @@ type PartViewer struct {
term *Terminal
}
type PartInfo struct {
Index []int
Msg *types.MessageInfo
Part *imap.BodyStructure
Store *lib.MessageStore
}
func NewPartViewer(conf *config.AercConfig,
store *lib.MessageStore, msg *types.MessageInfo,
part *imap.BodyStructure, showHeaders bool,

12
widgets/providesmessage.go
View File

@ -1,14 +1,24 @@
package widgets
import (
"github.com/emersion/go-imap"
"git.sr.ht/~sircmpwn/aerc/lib"
"git.sr.ht/~sircmpwn/aerc/lib/ui"
"git.sr.ht/~sircmpwn/aerc/worker/types"
)
type PartInfo struct {
Index []int
Msg *types.MessageInfo
Part *imap.BodyStructure
Store *lib.MessageStore
}
type ProvidesMessage interface {
ui.Drawable
Store() *lib.MessageStore
SelectedMessage() *types.MessageInfo
SelectedAccount() *AccountView
SelectedMessage() *types.MessageInfo
SelectedMessagePart() *PartInfo
}