_/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Parse headers from template"

Browse source 
This reverts commit 31e3e9f56e.
This commit is contained in:
Drew DeVault 2019-12-04 09:49:53 -05:00
parent abd9e78f02
commit eef662c606
1 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
widgets/compose.go
View file

@ -179,7 +179,8 @@ func (c *Composer) AddTemplate(template string, data interface{}) error {
if err != nil {
return err
}
return c.addTemplate(bytes.NewReader(templateText))
c.PrependContents(bytes.NewReader(templateText))
return nil
}
func (c *Composer) AddTemplateFromString(template string, data interface{}) error {
@ -191,44 +192,7 @@ func (c *Composer) AddTemplateFromString(template string, data interface{}) erro
if err != nil {
return err
}
return c.addTemplate(bytes.NewReader(templateText))
}
func (c *Composer) addTemplate(tmpl io.Reader) error {
reader, err := mail.CreateReader(tmpl)
if err != nil {
return errors.Wrap(err, "mail.CreateReader")
}
defer reader.Close()
// populate header editors
header := reader.Header
mhdr := (*message.Header)(&header.Header)
for _, editor := range c.editors {
if mhdr.Has(editor.name) {
editor.input.Set(mhdr.Get(editor.name))
mhdr.Del(editor.name)
}
}
part, err := reader.NextPart()
if err != nil {
return errors.Wrap(err, "reader.NextPart")
}
c.PrependContents(part.Body)
var (
headers string
fds = mhdr.Fields()
)
for fds.Next() {
headers += fmt.Sprintf("%s: %s\n", fds.Key(), fds.Value())
}
if headers != "" {
headers += "\n"
}
c.PrependContents(bytes.NewReader([]byte(headers)))
c.PrependContents(bytes.NewReader(templateText))
return nil
}