jh163888/nali
1
0
Fork 0
mirror of https://github.com/zu1k/nali.git synced 2025-01-22 13:19:02 +08:00
Code Issues Projects Releases Wiki Activity

Fix the bug that the output format is different from the original version.

Browse Source
This commit is contained in:
M09Ic 2023-05-20 17:37:24 +08:00
parent 36025d8f01
commit 05d918528f
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/root.go
View File

@ -75,14 +75,14 @@ Find document on: https://github.com/zu1k/nali
return return
} }
if isJson { if isJson {
_, _ = fmt.Fprintf(color.Output, "%s\n", entity.ParseLine(line).Json()) _, _ = fmt.Fprintf(color.Output, "%s", entity.ParseLine(line).Json())
} else { } else {
_, _ = fmt.Fprintf(color.Output, "%s\n", entity.ParseLine(line).ColorString()) _, _ = fmt.Fprintf(color.Output, "%s\n", entity.ParseLine(line).ColorString())
} }
} }
} else { } else {
if isJson { if isJson {
_, _ = fmt.Fprintf(color.Output, "%s\n", entity.ParseLine(strings.Join(args, " ")).Json()) _, _ = fmt.Fprintf(color.Output, "%s", entity.ParseLine(strings.Join(args, " ")).Json())
} else { } else {
_, _ = fmt.Fprintf(color.Output, "%s\n", entity.ParseLine(strings.Join(args, " ")).ColorString()) _, _ = fmt.Fprintf(color.Output, "%s\n", entity.ParseLine(strings.Join(args, " ")).ColorString())
} }

5
pkg/entity/entity.go
View File

@ -90,7 +90,10 @@ func (es Entities) ColorString() string {
func (es Entities) Json() string { func (es Entities) Json() string {
var s strings.Builder var s strings.Builder
for _, e := range es { for _, e := range es {
if e.Type == TypePlain {
continue
}
s.WriteString(e.Json() + "\n") s.WriteString(e.Json() + "\n")
} }
return strings.TrimSpace(s.String()) return s.String()
} }

15
pkg/entity/parse.go
View File

@ -48,6 +48,13 @@ func ParseLine(line string) Entities {
for _, e := range tmp { for _, e := range tmp {
start := e.Loc[0] start := e.Loc[0]
if start >= idx { if start >= idx {
if start > idx {
es = append(es, &Entity{
Loc: [2]int{idx, start},
Type: TypePlain,
Text: line[idx:start],
})
}
res := db.Find(dbif.QueryType(e.Type), e.Text) res := db.Find(dbif.QueryType(e.Type), e.Text)
if res != nil { if res != nil {
e.InfoText = res.String() e.InfoText = res.String()
@ -57,6 +64,12 @@ func ParseLine(line string) Entities {
} }
} }
} }
if total := len(line); idx < total {
es = append(es, &Entity{
Loc: [2]int{idx, total},
Type: TypePlain,
Text: line[idx:total],
})
}
return es return es
} }