修复filter不生效的bug

chainreactors · Nov 15, 2022 · 5ad24f8 · 5ad24f8
1 parent df3497c
commit 5ad24f8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/chainreactors/files v0.2.4
 	github.com/chainreactors/ipcs v0.0.9
 	github.com/chainreactors/logs v0.6.1
-	github.com/chainreactors/parsers v0.2.6
+	github.com/chainreactors/parsers v0.2.8
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/panjf2000/ants/v2 v2.5.0
 	golang.org/x/net v0.0.0-20190603091049-60506f45cf65

diff --git a/v2/go.sum b/v2/go.sum
@@ -8,8 +8,8 @@ github.com/chainreactors/ipcs v0.0.9 h1:4Onroq7gXLG5SLCCgNDx3JmtLxB4XgepGdHCtLp1
 github.com/chainreactors/ipcs v0.0.9/go.mod h1:E9M3Ohyq0TYQLlV4i2dbM9ThBZB1Nnd7Oexoie2xLII=
 github.com/chainreactors/logs v0.6.1 h1:+wLVqxErUyWYayAx6x+m5LA6jQBiHcLdTAJtiOUMoZU=
 github.com/chainreactors/logs v0.6.1/go.mod h1:Y0EtAnoF0kiASIJUnXN0pcOt420iRpHOAnOhEphzRHA=
-github.com/chainreactors/parsers v0.2.6 h1:yT7sh0xFHAA82BIKm3fHM3yLnhP7k7mGR/c6udM1E4k=
-github.com/chainreactors/parsers v0.2.6/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA=
+github.com/chainreactors/parsers v0.2.8 h1:97iv29dYCw+Yye/MzSkgdK0DPBDjSbS2k+RsdkHo1v4=
+github.com/chainreactors/parsers v0.2.8/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/v2/internal/core/init.go b/v2/internal/core/init.go
@@ -88,6 +88,9 @@ func InitConfig(config *Config) (*Config, error) {
 
 	if config.Results != nil && config.Filters != nil {
 		var results parsers.GOGOResults
+		if !config.FilterOr {
+			results = config.Results
+		}
 		for _, filter := range config.Filters {
 			if config.FilterOr {
 				results = append(results, config.Results.FilterWithString(filter)...)

diff --git a/v2/internal/core/output.go b/v2/internal/core/output.go
@@ -94,11 +94,14 @@ func FormatOutput(filename, outFilename, outf, filenamef string, filters []strin
 	} else if rd != nil && rd.Data != nil {
 		if len(filters) > 0 {
 			var results parsers.GOGOResults
+			if !filterOr {
+				results = rd.Data
+			}
 			for _, filter := range filters {
 				if filterOr {
 					results = append(results, rd.Filter(filter)...)
 				} else {
-					results = results.FilterWithString(filter)
+					results = rd.Data.FilterWithString(filter)
 				}
 			}
 			rd.Data = results