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 + ")")