From 2fc8e0aeed3b36b20864a9eeba2bf08c806dcd5c Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 16 Jul 2017 22:48:24 +0200 Subject: bikeshadding --- chksum/chksum.go | 11 ++++++----- chksum/chksum_test.go | 2 +- chksum/testdata/SUM | 4 ---- chksum/testdata/mixed | 4 ++++ 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 chksum/testdata/SUM create mode 100644 chksum/testdata/mixed (limited to 'chksum') diff --git a/chksum/chksum.go b/chksum/chksum.go index 2eefb52..847ae22 100644 --- a/chksum/chksum.go +++ b/chksum/chksum.go @@ -57,12 +57,13 @@ func Parse(data []byte) (Checklist, error) { return parse(r) } +var line = regexp.MustCompile(`(\w+) \(([^)]+)\) = (\w+)`) + func parse(r io.Reader) (Checklist, error) { var checklist Checklist - re := regexp.MustCompile(`(\w+) \(([^)]+)\) = (\w+)`) - scanner := bufio.NewScanner(r) - for scanner.Scan() { - match := re.FindStringSubmatch(scanner.Text()) + s := bufio.NewScanner(r) + for s.Scan() { + match := line.FindStringSubmatch(s.Text()) if len(match) != 4 { return nil, ErrParse } @@ -81,7 +82,7 @@ func parse(r io.Reader) (Checklist, error) { } checklist = append(checklist, cs) } - return checklist, scanner.Err() + return checklist, s.Err() } func (c Checksum) Check() error { diff --git a/chksum/chksum_test.go b/chksum/chksum_test.go index 3155d23..60a547e 100644 --- a/chksum/chksum_test.go +++ b/chksum/chksum_test.go @@ -10,7 +10,7 @@ func TestParseFile(t *testing.T) { {"testdata/SHA1"}, {"testdata/SHA256"}, {"testdata/SHA512"}, - {"testdata/SUM"}, + {"testdata/mixed"}, } for _, tc := range testCases { t.Run(tc.file, func(t *testing.T) { diff --git a/chksum/testdata/SUM b/chksum/testdata/SUM deleted file mode 100644 index a5e4ffc..0000000 --- a/chksum/testdata/SUM +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (testdata/emtpy) = d41d8cd98f00b204e9800998ecf8427e -SHA1 (testdata/emtpy) = da39a3ee5e6b4b0d3255bfef95601890afd80709 -SHA256 (testdata/emtpy) = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -SHA512 (testdata/emtpy) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e diff --git a/chksum/testdata/mixed b/chksum/testdata/mixed new file mode 100644 index 0000000..a5e4ffc --- /dev/null +++ b/chksum/testdata/mixed @@ -0,0 +1,4 @@ +MD5 (testdata/emtpy) = d41d8cd98f00b204e9800998ecf8427e +SHA1 (testdata/emtpy) = da39a3ee5e6b4b0d3255bfef95601890afd80709 +SHA256 (testdata/emtpy) = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 +SHA512 (testdata/emtpy) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e -- cgit v1.2.3