JPT/mailq-inspector
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Jan Philipp Timme 2018-12-29 22:02:23 +01:00
parent 874d000879
commit 8ca26b3d9d
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@ -1,7 +1,6 @@
package main package main
import ( import (
"bufio"
"flag" "flag"
"fmt" "fmt"
"os" "os"
@ -16,8 +15,12 @@ var settings = make(map[string]string)
func argParse() { func argParse() {
inputModePtr := flag.String("inputMode", "stdin", "How to get mailq output. Available options: \"stdin\", 'cmd'") inputModePtr := flag.String("inputMode", "stdin", "How to get mailq output. Available options: \"stdin\", 'cmd'")
mailqCommandPtr := flag.String("mailqCommand", "mailq", "Command to use for getting mailq output")
mailqCommandArgsPtr := flag.String("mailqCommandArgs", "", "Optional arguments to pass to mailqCommand")
flag.Parse() flag.Parse()
settings["inputMode"] = *inputModePtr settings["inputMode"] = *inputModePtr
settings["mailqCommand"] = *mailqCommandPtr
settings["mailqCommandArgs"] = *mailqCommandArgsPtr
} }
func main() { func main() {
@ -27,7 +30,7 @@ func main() {
if settings["inputMode"] == "stdin" { if settings["inputMode"] == "stdin" {
entries, err = readFromStdin() entries, err = readFromStdin()
} else if settings["inputMode"] == "cmd" { } else if settings["inputMode"] == "cmd" {
entries, err = readFromCmd(exec.Command("mailq")) entries, err = readFromCmd(exec.Command(settings["mailqCommand"]))
} else { } else {
fmt.Printf("Unsupported inputMode!") fmt.Printf("Unsupported inputMode!")
flag.PrintDefaults() flag.PrintDefaults()
@ -45,18 +48,20 @@ func main() {
} }
func readFromStdin() ([]parser.QEntry, error) { func readFromStdin() ([]parser.QEntry, error) {
scanner := bufio.NewScanner(os.Stdin) return parser.ParseMailQ(os.Stdin)
return parser.ParseMailQ(scanner)
} }
func readFromCmd(cmd *exec.Cmd) ([]parser.QEntry, error) { func readFromCmd(cmd *exec.Cmd) ([]parser.QEntry, error) {
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
err = cmd.Start() if err != nil {
scanner := bufio.NewScanner(stdout) return nil, err
result, resErr := parser.ParseMailQ(scanner) }
err = cmd.Wait() if err := cmd.Start(); err != nil {
if err != nil { return nil, err
fmt.Printf("Oh no: %s", err.Error()) }
result, resultError := parser.ParseMailQ(stdout)
if err := cmd.Wait(); err != nil {
return nil, err
} }
return result, resErr return result, resultError
} }

4
parser/parser.go
View File

@ -4,6 +4,7 @@ import (
"bufio" "bufio"
"errors" "errors"
"fmt" "fmt"
"io"
"regexp" "regexp"
"strconv" "strconv"
"strings" "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)) 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" const dateFormat = "2006 Mon Jan _2 15:04:05"
var messageIdStart = regexp.MustCompile("^[0-9A-Za-z]+[*!]? ") var messageIdStart = regexp.MustCompile("^[0-9A-Za-z]+[*!]? ")
scanner := bufio.NewScanner(dataSource)
scanner.Scan() scanner.Scan()
line := scanner.Text() line := scanner.Text()
if strings.HasPrefix(line, "Mail queue is empty") { if strings.HasPrefix(line, "Mail queue is empty") {