Refactoring

parser/parser.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+    "io"
 	"regexp"
 	"strconv"
 	"strings"
@@ -24,9 +25,10 @@ func (m QEntry) String() string {
 	return fmt.Sprintf("ID: %s, Status: %s, Size: %d bytes, Sender: %s, Recipients: %d", m.id, m.status, m.size, m.sender, len(m.recipients))
 }
 
-func ParseMailQ(scanner *bufio.Scanner) ([]QEntry, error) {
+func ParseMailQ(dataSource io.Reader) ([]QEntry, error) {
 	const dateFormat = "2006 Mon Jan _2 15:04:05"
 	var messageIdStart = regexp.MustCompile("^[0-9A-Za-z]+[*!]? ")
+	scanner := bufio.NewScanner(dataSource)
 	scanner.Scan()
 	line := scanner.Text()
 	if strings.HasPrefix(line, "Mail queue is empty") {