refactor: remove dead code

pkg/mime/encoding_test.go

@@ -59,8 +59,6 @@ func TestDecodeHeader(t *testing.T) {
 	for _, val := range testData {
 		if decoded, err := DecodeHeader(val.raw); strings.Compare(val.expected, decoded) != 0 {
 			t.Errorf("Incorrect decoding of header %q expected %q but have %q; Error %v", val.raw, val.expected, decoded, err)
-		} else {
-			// fmt.Println("Header", val.raw, "successfully decoded", decoded, ". Error", err)
 		}
 	}
 }

pkg/mime/mediaType.go

@@ -87,19 +87,17 @@ func changeEncodingAndKeepLastParamDefinition(v string) (out string, err error)
 		return
 	}
 
-	if continuation != nil {
-		for paramKey, contMap := range continuation {
-			value, err := mergeContinuations(paramKey, contMap)
-			if err == nil {
-				params[paramKey+"*"] = value
-				continue
-			}
+	for paramKey, contMap := range continuation {
+		value, err := mergeContinuations(paramKey, contMap)
+		if err == nil {
+			params[paramKey+"*"] = value
+			continue
+		}
 
-			// Fallback.
-			log.Errorln("Merge param", paramKey, ":", err)
-			for ck, cv := range contMap {
-				params[ck] = cv
-			}
+		// Fallback.
+		log.Errorln("Merge param", paramKey, ":", err)
+		for ck, cv := range contMap {
+			params[ck] = cv
 		}
 	}
 

pkg/mime/parser.go

@@ -18,7 +18,6 @@
 package pmmime
 
 import (
-	"bufio"
 	"bytes"
 	"io"
 	"io/ioutil"
@@ -106,50 +105,6 @@ func NewMimeVisitor(targetAccepter VisitAcceptor) *MimeVisitor {
 	return &MimeVisitor{targetAccepter}
 }
 
-func GetRawMimePart(rawdata io.Reader, boundary string) (io.Reader, io.Reader) {
-	b, _ := ioutil.ReadAll(rawdata)
-	tee := bytes.NewReader(b)
-
-	reader := bufio.NewReader(bytes.NewReader(b))
-	byteBoundary := []byte(boundary)
-	bodyBuffer := &bytes.Buffer{}
-	for {
-		line, _, err := reader.ReadLine()
-		if err != nil {
-			return tee, bytes.NewReader(bodyBuffer.Bytes())
-		}
-		if bytes.HasPrefix(line, byteBoundary) {
-			break
-		}
-	}
-	lineEndingLength := 0
-	for {
-		line, isPrefix, err := reader.ReadLine()
-		if err != nil {
-			return tee, bytes.NewReader(bodyBuffer.Bytes())
-		}
-		if bytes.HasPrefix(line, byteBoundary) {
-			break
-		}
-		lineEndingLength = 0
-		bodyBuffer.Write(line)
-		if !isPrefix {
-			reader.UnreadByte()
-			reader.UnreadByte()
-			token, _ := reader.ReadByte()
-			if token == '\r' {
-				lineEndingLength++
-				bodyBuffer.WriteByte(token)
-			}
-			lineEndingLength++
-			bodyBuffer.WriteByte(token)
-		}
-	}
-	ioutil.ReadAll(reader)
-	data := bodyBuffer.Bytes()
-	return tee, bytes.NewReader(data[0 : len(data)-lineEndingLength])
-}
-
 func GetAllChildParts(part io.Reader, h textproto.MIMEHeader) (parts []io.Reader, headers []textproto.MIMEHeader, err error) {
 	mediaType, params, err := getContentType(h)
 	if err != nil {
@@ -272,25 +227,6 @@ func parseAddressComment(raw string) string {
 	return strings.Join(parsed, ", ")
 }
 
-func checkHeaders(headers []textproto.MIMEHeader) bool {
-	foundAttachment := false
-
-	for i := 0; i < len(headers); i++ {
-		h := headers[i]
-
-		mediaType, _, _ := getContentType(h)
-
-		if !strings.HasPrefix(mediaType, "text/") {
-			foundAttachment = true
-		} else if foundAttachment {
-			// This means that there is a text part after the first attachment,
-			// so we will have to convert the body from plain->HTML.
-			return true
-		}
-	}
-	return false
-}
-
 func decodePart(partReader io.Reader, header textproto.MIMEHeader) (decodedPart io.Reader) {
 	decodedPart = DecodeContentEncoding(partReader, header.Get("Content-Transfer-Encoding"))
 	if decodedPart == nil {

pkg/mime/parser_test.go

@@ -60,6 +60,9 @@ func androidParse(mimeBody string) (body, headers string, atts, attHeaders []str
 
 	h := textproto.MIMEHeader(mm.Header)
 	mmBodyData, err := ioutil.ReadAll(mm.Body)
+	if err != nil {
+		return
+	}
 
 	printAccepter := NewMIMEPrinter()
 	bodyCollector := NewBodyCollector(printAccepter)