aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorSrivathsan Murali <sri@vathsan.com>2019-11-03 13:51:14 +0100
committerDrew DeVault <sir@cmpwn.com>2019-11-10 10:15:49 -0500
commit3ba69edab5f0c787424dac9649e43a7743da13ca (patch)
treebccbdd4e1844cc89f011839f0d6557012a14d1d0 /widgets
parentad68a9e4e471eb708893ad16601ab14a4672a2da (diff)
downloadaerc-3ba69edab5f0c787424dac9649e43a7743da13ca.tar.gz
Add Templates with Parsing
+ Changes NewComposer to return error. + Add lib to handle templates using "text/template". + Add -T option to following commands - compose. - reply - forward + Quoted replies using templates. + Forwards as body using templates + Default templates are installed similar to filters. + Templates Config in aerc.conf. - Required templates are parsed while loading config. + Add aerc-templates.7 manual for using template data.
Diffstat (limited to 'widgets')
-rw-r--r--widgets/aerc.go7
-rw-r--r--widgets/compose.go37
2 files changed, 39 insertions, 5 deletions
diff --git a/widgets/aerc.go b/widgets/aerc.go
index af51a0f4..d324908b 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -431,8 +431,11 @@ func (aerc *Aerc) Mailto(addr *url.URL) error {
defaults[header] = strings.Join(vals, ",")
}
}
- composer := NewComposer(aerc, aerc.Config(),
- acct.AccountConfig(), acct.Worker(), defaults)
+ composer, err := NewComposer(aerc, aerc.Config(),
+ acct.AccountConfig(), acct.Worker(), "", defaults)
+ if err != nil {
+ return nil
+ }
composer.FocusSubject()
title := "New email"
if subj, ok := defaults["Subject"]; ok {
diff --git a/widgets/compose.go b/widgets/compose.go
index 22c58da5..a55d147f 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -23,6 +23,7 @@ import (
"github.com/pkg/errors"
"git.sr.ht/~sircmpwn/aerc/config"
+ "git.sr.ht/~sircmpwn/aerc/lib/templates"
"git.sr.ht/~sircmpwn/aerc/lib/ui"
"git.sr.ht/~sircmpwn/aerc/worker/types"
)
@@ -53,7 +54,7 @@ type Composer struct {
}
func NewComposer(aerc *Aerc, conf *config.AercConfig,
- acct *config.AccountConfig, worker *types.Worker, defaults map[string]string) *Composer {
+ acct *config.AccountConfig, worker *types.Worker, template string, defaults map[string]string) (*Composer, error) {
if defaults == nil {
defaults = make(map[string]string)
@@ -62,13 +63,14 @@ func NewComposer(aerc *Aerc, conf *config.AercConfig,
defaults["From"] = acct.From
}
+ templateData := templates.ParseTemplateData(defaults)
layout, editors, focusable := buildComposeHeader(
conf.Compose.HeaderLayout, defaults)
email, err := ioutil.TempFile("", "aerc-compose-*.eml")
if err != nil {
// TODO: handle this better
- return nil
+ return nil, err
}
c := &Composer{
@@ -86,11 +88,14 @@ func NewComposer(aerc *Aerc, conf *config.AercConfig,
}
c.AddSignature()
+ if err := c.AddTemplate(template, templateData); err != nil {
+ return nil, err
+ }
c.updateGrid()
c.ShowTerminal()
- return c
+ return c, nil
}
func buildComposeHeader(layout HeaderLayout, defaults map[string]string) (
@@ -163,6 +168,32 @@ func (c *Composer) AppendContents(reader io.Reader) {
c.email.Sync()
}
+func (c *Composer) AddTemplate(template string, data interface{}) error {
+ if template == "" {
+ return nil
+ }
+
+ templateText, err := templates.ParseTemplateFromFile(template, c.config.Templates.TemplateDirs, data)
+ if err != nil {
+ return err
+ }
+ c.PrependContents(bytes.NewReader(templateText))
+ return nil
+}
+
+func (c *Composer) AddTemplateFromString(template string, data interface{}) error {
+ if template == "" {
+ return nil
+ }
+
+ templateText, err := templates.ParseTemplate(template, data)
+ if err != nil {
+ return err
+ }
+ c.PrependContents(bytes.NewReader(templateText))
+ return nil
+}
+
func (c *Composer) AddSignature() {
var signature []byte
if c.acct.SignatureCmd != "" {