Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-16 23:26:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: tidy a bit

Browse Source
This commit is contained in:
James Houlahan
2020-08-05 15:00:31 +02:00
parent 0d4d95360f
commit f4374a02da
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/message/parser/parser.go
View File

@ -1,19 +1,13 @@
package parser
import (
"fmt"
"io"
"io/ioutil"
"github.com/emersion/go-message"
)
// TODO: Set this to something that handles charsets.
func init() { // nolint[gochecknoinits]
message.CharsetReader = func(string, io.Reader) (io.Reader, error) {
panic("not implemented")
}
}
type Parser struct {
stack []*Part
root *Part
@ -49,7 +43,7 @@ func (p *Parser) Part(number []int) (part *Part, err error) {
part = p.root
for _, n := range number {
if part, err = part.Part(n); err != nil {
if part, err = part.Child(n); err != nil {
return
}
}
@ -57,13 +51,17 @@ func (p *Parser) Part(number []int) (part *Part, err error) {
return
}
func (p *Parser) parse(r io.Reader) (err error) {
e, err := message.Read(r)
func (p *Parser) parse(r io.Reader) error {
entity, err := message.Read(r)
if err != nil {
return
if !message.IsUnknownCharset(err) {
return err
} else {
fmt.Println(err)
}
}
return p.parseEntity(e)
return p.parseEntity(entity)
}
func (p *Parser) enter() {