Add pass and skip from CSV (#30)

Author: vearutop

cmd/catp/catp/app.go

@@ -29,14 +29,19 @@ func Main(options ...func(o *Options)) error { //nolint:funlen,cyclop,gocognit,g
 	r := &runner{}
 
 	flag.Var(flagFunc(func(v string) error {
-		r.filters = append(r.filters, filter{pass: true, ms: v, and: bytes.Split([]byte(v), []byte("^"))})
+		r.filters = append(r.filters, filter{pass: true, and: bytes.Split([]byte(v), []byte("^"))})
 
 		return nil
 	}), "pass", "filter matching, may contain multiple AND patterns separated by ^,\n"+
 		"if filter matches, line is passed to the output (may be filtered out by preceding -skip)\n"+
 		"other -pass values are evaluated if preceding pass/skip did not match,\n"+
 		"for example, you can use \"-pass bar^baz -pass foo -skip fo\" to only keep lines that have (bar AND baz) OR foo, but not fox")
 
+	flag.Var(flagFunc(func(v string) error {
+		return r.loadCSVFilter(v, true)
+	}), "pass-csv", "filter matching, loads pass params from CSV file,\n"+
+		"each line is treated as -pass, each column value is AND condition.")
+
 	flag.BoolFunc("pass-any", "finishes matching and gets the value even if previous -pass did not match,\n"+
 		"if previous -skip matched, the line would be skipped any way.", func(s string) error {
 		r.filters = append(r.filters, filter{pass: true})
@@ -45,7 +50,12 @@ func Main(options ...func(o *Options)) error { //nolint:funlen,cyclop,gocognit,g
 	})
 
 	flag.Var(flagFunc(func(v string) error {
-		r.filters = append(r.filters, filter{pass: false, ms: v, and: bytes.Split([]byte(v), []byte("^"))})
+		return r.loadCSVFilter(v, false)
+	}), "skip-csv", "filter matching, loads skip params from CSV file,\n"+
+		"each line is treated as -skip, each column value is AND condition.")
+
+	flag.Var(flagFunc(func(v string) error {
+		r.filters = append(r.filters, filter{pass: false, and: bytes.Split([]byte(v), []byte("^"))})
 
 		return nil
 	}), "skip", "filter matching, may contain multiple AND patterns separated by ^,\n"+

cmd/catp/catp/catp.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"encoding/csv"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -69,7 +70,6 @@ type (
 	filter struct {
 		pass bool // Skip is false.
 		and  [][]byte
-		ms   string
 	}
 	flagFunc func(v string) error
 )
@@ -504,3 +504,28 @@ type Options struct {
 	// You can use buf to avoid allocations for a result, and change its capacity if needed.
 	PrepareLine func(filename string, lineNr int, line []byte, buf *[]byte) []byte
 }
+
+func (r *runner) loadCSVFilter(fn string, pass bool) error {
+	f, err := os.Open(fn) //nolint:gosec
+	if err != nil {
+		return fmt.Errorf("failed to open CSV file %s: %w", fn, err)
+	}
+
+	cr := csv.NewReader(f)
+
+	rows, err := cr.ReadAll()
+	if err != nil {
+		return fmt.Errorf("failed to read CSV file %s: %w", fn, err)
+	}
+
+	for _, row := range rows {
+		var and [][]byte
+		for _, v := range row {
+			and = append(and, []byte(v))
+		}
+
+		r.filters = append(r.filters, filter{pass: pass, and: and})
+	}
+
+	return nil
+}