From e3c849545079fb998bb21a3644f5a0da36bce5d3 Mon Sep 17 00:00:00 2001 From: Nick White Date: Thu, 22 Aug 2019 10:43:03 +0100 Subject: gofmt --- bookpipeline/main.go | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'bookpipeline/main.go') diff --git a/bookpipeline/main.go b/bookpipeline/main.go index c1fb547..24e4e74 100644 --- a/bookpipeline/main.go +++ b/bookpipeline/main.go @@ -1,4 +1,5 @@ package main + // TODO: have logs go somewhere useful, like email // TODO: check if images are prebinarised and if so skip multiple binarisation @@ -37,6 +38,7 @@ const training = "rescribealphav5" // TODO: allow to set on cmdline // null writer to enable non-verbose logging to be discarded type NullWriter bool + func (w NullWriter) Write(p []byte) (n int, err error) { return len(p), nil } @@ -175,11 +177,11 @@ func preprocBook(msg Qmsg, conn Pipeliner) error { // wait for either the done or errc channel to be sent to select { - case err = <-errc: - t.Stop() - _ = os.RemoveAll(d) - return err - case <-done: + case err = <-errc: + t.Stop() + _ = os.RemoveAll(d) + return err + case <-done: } conn.Logger().Println("Sending", bookname, "to OCR queue") @@ -246,11 +248,11 @@ func ocrBook(msg Qmsg, conn Pipeliner) error { // wait for either the done or errc channel to be sent to select { - case err = <-errc: - t.Stop() - _ = os.RemoveAll(d) - return err - case <-done: + case err = <-errc: + t.Stop() + _ = os.RemoveAll(d) + return err + case <-done: } conn.Logger().Println("Sending", bookname, "to analyse queue") @@ -292,7 +294,7 @@ func main() { } var conn Pipeliner - conn = &awsConn{ region: "eu-west-2", logger: verboselog } + conn = &awsConn{region: "eu-west-2", logger: verboselog} verboselog.Println("Setting up AWS session") err := conn.Init() @@ -308,7 +310,7 @@ func main() { for { select { - case <- checkPreQueue: + case <-checkPreQueue: msg, err := conn.CheckPreQueue() checkPreQueue = time.After(PauseBetweenChecks) if err != nil { @@ -323,7 +325,7 @@ func main() { if err != nil { log.Println("Error during preprocess", err) } - case <- checkOCRQueue: + case <-checkOCRQueue: msg, err := conn.CheckOCRQueue() checkOCRQueue = time.After(PauseBetweenChecks) if err != nil { -- cgit v1.2.1-24-ge1ad