From f8b84c733b77812229181652efd76f2430c6a0a6 Mon Sep 17 00:00:00 2001 From: M09Ic Date: Mon, 9 Jan 2023 15:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4=E8=A1=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0,=20=E5=BD=93-w=E4=B8=8E-d=E9=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0"/"=E9=98=B2=E6=AD=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/option.go | 4 +++- pkg/baseline.go | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/option.go b/internal/option.go index aeb10e3..b28515c 100644 --- a/internal/option.go +++ b/internal/option.go @@ -232,12 +232,14 @@ func (opt *Option) PrepareRunner() (*Runner, error) { logs.Log.Importantf("Loaded %d word from %s", len(dicts[i]), f) } - if opt.Word == "" { + if len(opt.Dictionaries) > 0 && opt.Word == "" { opt.Word = "{?" for i, _ := range dicts { opt.Word += strconv.Itoa(i) } opt.Word += "}" + } else { + opt.Word = "/" } if opt.Suffixes != nil { diff --git a/pkg/baseline.go b/pkg/baseline.go index 82e44ae..a1ec5d6 100644 --- a/pkg/baseline.go +++ b/pkg/baseline.go @@ -337,11 +337,12 @@ func (bl *Baseline) Format(probes []string) string { func (bl *Baseline) ColorString() string { var line strings.Builder + line.WriteString(logs.GreenLine("[" + GetSourceName(bl.Source) + "]")) if bl.FrontURL != "" { - line.WriteString("\t") line.WriteString(logs.CyanLine(bl.FrontURL)) line.WriteString(" --> ") } + line.WriteString(" ") line.WriteString(logs.GreenLine(bl.UrlString)) if bl.Host != "" { line.WriteString(" (" + bl.Host + ")") @@ -368,7 +369,6 @@ func (bl *Baseline) ColorString() string { } line.WriteString(" - ") line.WriteString(logs.YellowBold(strconv.Itoa(int(bl.Spended)) + "ms")) - line.WriteString(logs.YellowBold(" - " + GetSourceName(bl.Source))) line.WriteString(logs.GreenLine(bl.Additional("title"))) if bl.Distance != 0 { line.WriteString(logs.GreenLine(bl.Additional("sim"))) @@ -391,11 +391,12 @@ func (bl *Baseline) ColorString() string { func (bl *Baseline) String() string { var line strings.Builder + line.WriteString(logs.GreenLine("[" + GetSourceName(bl.Source) + "]")) if bl.FrontURL != "" { - line.WriteString("\t") line.WriteString(bl.FrontURL) line.WriteString(" --> ") } + line.WriteString(" ") line.WriteString(bl.UrlString) if bl.Host != "" { line.WriteString(" (" + bl.Host + ")")