Adjust filter helpers API based on current use cases.

filter/filters.go

@@ -5,40 +5,19 @@ import (
 	"path/filepath"
 )
 
-// Extensions returns a filter function that ignores any of the given file
-// extensions.
-func Extensions(exts ...string) Func {
-	return func(path string, _ os.FileInfo) bool {
-		for _, ext := range exts {
-			if filepath.Ext(path) == ext {
-				return true
-			}
-		}
-		return false
-	}
-}
-
-// Not negates the given filter, such that:
+// FilesWithExtensions returns a filter that ignores files (but not directories) that
+// have any of the given extensions. For example:
 //
-// 	Not(Extensions(".go", ".html"))
+// 	filter.FilesWithExtensions(".go", ".html")
 //
-// would ignore any file that is not a .go or .html file.
-func Not(filter Func) Func {
+// Would ignore both .go and .html files. It would not ignore any directories.
+func FilesWithExtensions(exts ...string) Func {
 	return func(path string, fi os.FileInfo) bool {
-		return !filter(path, fi)
-	}
-}
-
-// Combine combines multiple filter functions into one. Effectively it is an
-// multiple OR operator, that is:
-//
-// 	Combine(Extensions(".go"), Extensions(".html"))
-//
-// would ignore both .go and .html files.
-func Combine(filters ...Func) Func {
-	return func(path string, fi os.FileInfo) bool {
-		for _, filter := range filters {
-			if filter(path, fi) {
+		if fi.IsDir() {
+			return false
+		}
+		for _, ext := range exts {
+			if filepath.Ext(path) == ext {
 				return true
 			}
 		}