Merge pull request #167 from jedevc/fsutil-fs-in-opt

fs: split out include/exclude into new FilterFS
tonistiigi · Aug 25, 2023 · eec1962 · eec1962
2 parents 36ef4d8 + da27602
commit eec1962
Show file tree

Hide file tree

Showing 11 changed files with 907 additions and 219 deletions.
diff --git a/cmd/send/send.go b/cmd/send/send.go
@@ -18,7 +18,11 @@ func main() {
 	ctx := context.Background()
 	s := util.NewProtoStream(ctx, os.Stdin, os.Stdout)
 
-	if err := fsutil.Send(ctx, s, fsutil.NewFS(flag.Args()[0], nil), nil); err != nil {
+	fs, err := fsutil.NewFS(flag.Args()[0])
+	if err != nil {
+		panic(err)
+	}
+	if err := fsutil.Send(ctx, s, fs, nil); err != nil {
 		panic(err)
 	}
 }
diff --git a/cmd/walk/walk.go b/cmd/walk/walk.go
@@ -25,7 +25,7 @@ func main() {
 		excludes = strings.Split(string(dt), "\n")
 	}
 
-	if err := fsutil.Walk(context.Background(), flag.Args()[0], &fsutil.WalkOpt{
+	if err := fsutil.Walk(context.Background(), flag.Args()[0], &fsutil.FilterOpt{
 		ExcludePatterns: excludes,
 	}, func(path string, fi os.FileInfo, err error) error {
 		if err != nil {