From 18abd7e2041ba1d7ed2a9d1a986c878d779f423f Mon Sep 17 00:00:00 2001 From: skanehira Date: Sat, 2 Nov 2019 17:40:28 +0900 Subject: [PATCH] improve run function --- main.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/main.go b/main.go index 5d22a2a..3e69577 100644 --- a/main.go +++ b/main.go @@ -46,33 +46,30 @@ func init() { } func run() int { + var i interface{} if *url != "" { resp, err := http.Get(*url) if err != nil { return printError(err) } - i, err := gui.UnMarshalJSON(resp.Body) + i, err = gui.UnMarshalJSON(resp.Body) if err != nil { return printError(err) } - - if err := gui.New().Run(i); err != nil { - return printError(err) - } - return 0 } if !terminal.IsTerminal(0) { - i, err := gui.UnMarshalJSON(os.Stdin) + var err error + i, err = gui.UnMarshalJSON(os.Stdin) if err != nil { return printError(err) } + } - if err := gui.New().Run(i); err != nil { - log.Println(err) - return 1 - } + if err := gui.New().Run(i); err != nil { + log.Println(err) + return 1 } return 0 }