Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: tidier encoding detection

Browse Source
This commit is contained in:
James Houlahan
2020-08-17 17:09:34 +02:00
parent f4dfadce52
commit 6a7a77fc51
4 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/message/parser/parser_test.go
View File

@ -28,13 +28,13 @@ import (
)
func newTestParser(t *testing.T, msg string) *Parser {
p, err := New(f(msg))
p, err := New(getFileReader(msg))
require.NoError(t, err)
return p
}
func f(filename string) io.ReadCloser {
func getFileReader(filename string) io.ReadCloser {
f, err := os.Open(filepath.Join("testdata", filename))
if err != nil {
@ -44,8 +44,8 @@ func f(filename string) io.ReadCloser {
return f
}
func s(filename string) string {
b, err := ioutil.ReadAll(f(filename))
func getFileAsString(filename string) string {
b, err := ioutil.ReadAll(getFileReader(filename))
if err != nil {
panic(err)
}

23
pkg/message/parser/part.go
View File

@ -74,12 +74,7 @@ func (p *Part) ConvertToUTF8() error {
return err
}
decoder := selectDecoderFromParams(params)
if decoder == nil {
encoding, _, _ := charset.DetermineEncoding(p.Body, t)
decoder = encoding.NewDecoder()
}
decoder := selectSuitableDecoder(p, t, params)
if p.Body, err = decoder.Bytes(p.Body); err != nil {
return err
@ -97,18 +92,16 @@ func (p *Part) ConvertToUTF8() error {
return nil
}
func selectDecoderFromParams(params map[string]string) *encoding.Decoder {
charset, ok := params["charset"]
if !ok {
return nil
func selectSuitableDecoder(p *Part, t string, params map[string]string) *encoding.Decoder {
if charset, ok := params["charset"]; ok {
if decoder, err := pmmime.SelectDecoder(charset); err == nil {
return decoder
}
}
decoder, err := pmmime.SelectDecoder(charset)
if err != nil {
return nil
}
encoding, _, _ := charset.DetermineEncoding(p.Body, t)
return decoder
return encoding.NewDecoder()
}
func (p *Part) is7BitClean() bool {

2
pkg/message/parser/writer_test.go
View File

@ -33,7 +33,7 @@ func TestParserWrite(t *testing.T) {
buf := new(bytes.Buffer)
assert.NoError(t, w.Write(buf))
assert.Equal(t, s("text_html_octet_attachment.eml"), crlf(buf.String()))
assert.Equal(t, getFileAsString("text_html_octet_attachment.eml"), crlf(buf.String()))
}
func crlf(s string) string {