From 3857c4fea031271f4ef37ddbe564eea25f8591c3 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sun, 10 Feb 2019 02:36:20 +0300 Subject: [PATCH] UI fixes --- cli/cli.go | 11 +++++------ cli/details.go | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 8b27dab..c7ed75a 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -197,6 +197,7 @@ func process(args []string) { checksInfo = append(checksInfo, checkInfo) default: grade = check(host) + fmtc.NewLine() } switch { @@ -245,14 +246,12 @@ func check(host string) string { IgnoreMismatch: options.GetB(OPT_IGNORE_MISMATCH), } - if !options.GetB(OPT_DETAILED) { - fmtc.TPrintf("{*}%s{!} → {s}Preparing for tests…{!}", host) - } + fmtc.TPrintf("{*}%s{!} → {s}Preparing for tests…{!}", host) ap, err := api.Analyze(host, params) if err != nil { - fmtc.Printf("{r}%v{!}\n", err) + fmtc.TPrintf("{*}%s{!} → {r}%v{!}\n", host, err) return "T" } @@ -260,12 +259,12 @@ func check(host string) string { info, err = ap.Info(false) if err != nil { - fmtc.Printf("{*}%s{!} → {r}%v{!}\n", host, err) + fmtc.TPrintf("{*}%s{!} → {r}%v{!}\n", host, err) return "Err" } if info.Status == sslscan.STATUS_ERROR { - fmtc.Printf("{*}%s{!} → {r}%s{!}\n", host, info.StatusMessage) + fmtc.TPrintf("{*}%s{!} → {r}%s{!}\n", host, info.StatusMessage) return "Err" } else if info.Status == sslscan.STATUS_READY { break diff --git a/cli/details.go b/cli/details.go index c23f350..0ffc7f6 100644 --- a/cli/details.go +++ b/cli/details.go @@ -76,8 +76,6 @@ func printDetailedInfo(ap *sslscan.AnalyzeProgress) { fmtc.Printf("\n{c*} %s {!*}#%d (%s){!}\n", info.Host, index+1, endpoint.IPAdress) printDetailedEndpointInfo(endpoint, info.Certs) } - - fmtc.NewLine() } // printCertificateInfo prints info about server certificate