From 76389cdf55fa264d1454e9de480dd70bc21064e2 Mon Sep 17 00:00:00 2001 From: Jean-Marc MEESSEN Date: Mon, 29 Jun 2020 13:33:07 +0200 Subject: [PATCH] make the fullLog a parameter (and not a global value) --- cmd/load.go | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/cmd/load.go b/cmd/load.go index 5ba2200..b550f9c 100644 --- a/cmd/load.go +++ b/cmd/load.go @@ -57,7 +57,9 @@ func init() { // loadCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") } -func loadFile() { + +//returns nill if failure to process +func loadFile() (filleFullLog []LogLine) { file, err := os.Open(inputFilename) if err != nil { @@ -105,7 +107,7 @@ func loadFile() { var errorLog []string var previousLogLine LogLine - var fullLog []LogLine + fullLog := []LogLine{} //Loop through all the stored lined for _, eachline := range txtlines { @@ -263,15 +265,27 @@ func loadFile() { } previousLogLine = logline //Go back to the top (Continue not necessary) + } + + displayLogSimple(fullLog) + //Display parsing errors, if any + if len(errorLog) != 0 { + fmt.Println("\nProcessing errors:") + for _, errorLogLine := range errorLog { + fmt.Println(errorLogLine) + } + return nil + } else { + fmt.Println("\nSuccesfuly parsed ", lineCount, " lines.") } - //***** - //** display results - //***** - // for _, filledLofLine := range fullLog { - // fmt.Println(SprintLogRecord(filledLofLine)) - // } + return fullLog + +} + +//displayLogSimple will print to stdout a simplified dump of a full log +func displayLogSimple(fullLog []LogLine) { firstLine := true for _, filledLogLine := range fullLog { if firstLine { @@ -282,13 +296,5 @@ func loadFile() { fmt.Print(SprintLogInColumn(filledLogLine)) } - if len(errorLog) != 0 { - fmt.Println("\nProcessing errors:") - for _, errorLogLine := range errorLog { - fmt.Println(errorLogLine) - } - } else { - fmt.Println("\nSuccesfuly parsed ", lineCount, " lines.") - } - } +