Skip to content

Commit

Permalink
using mime/quotedprintable for line width limiting
Browse files Browse the repository at this point in the history
  • Loading branch information
laochailan committed Apr 21, 2016
1 parent 1588b3c commit 1c076e8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 4 additions & 1 deletion barely.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ func main() {
buffers.Init()

for len(buffers.buffers) > 0 {
termbox.Flush()
err = termbox.Flush()
if err != nil {
log.Fatal(err)
}
event := termbox.PollEvent()
buffers.HandleEvent(&event)
}
Expand Down
10 changes: 6 additions & 4 deletions mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"io/ioutil"
"mime"
"mime/multipart"
"mime/quotedprintable"
"net/mail"
"net/textproto"
"os"
Expand Down Expand Up @@ -257,7 +258,7 @@ func (m *Mail) attachFile(filename string) error {
}

var buf bytes.Buffer
nlInsert := newNewlineInserter(&buf, 78)
nlInsert := newNewlineInserter(&buf, 76)
enc := base64.NewEncoder(base64.StdEncoding, nlInsert)
_, err = io.Copy(enc, file)
if err != nil {
Expand Down Expand Up @@ -300,7 +301,7 @@ func (m *Mail) Encode() (string, error) {
headers := make([]string, 0, len(m.Header))

for key, val := range m.Header {
for i, _ := range val {
for i := range val {
if val[i] == "" {
continue
}
Expand Down Expand Up @@ -331,7 +332,8 @@ func (m *Mail) Encode() (string, error) {
}

if len(m.Parts) == 1 {
writer := qp.NewEncoder(&buffer)
writer := quotedprintable.NewWriter(&buffer)
defer writer.Close()
_, err := writer.Write([]byte(m.Parts[0].Body))
if err != nil {
return "", err
Expand Down Expand Up @@ -449,7 +451,7 @@ func (n *newlineInserter) Write(data []byte) (int, error) {
if err != nil {
return written, err
}
num, err = n.w.Write([]byte{'\n'})
num, err = n.w.Write([]byte{'\r', '\n'})
written += num
if err != nil {
return written, err
Expand Down

0 comments on commit 1c076e8

Please sign in to comment.