diff --git a/cmd/files.go b/cmd/files.go index 3f05859..778fb36 100644 --- a/cmd/files.go +++ b/cmd/files.go @@ -95,8 +95,20 @@ func appendPaths(path string, files *Files, filters *Filters, stats *Stats) erro filename = strings.ToLower(filename) - switch { - case filters.HasIncludes() && !filters.HasExcludes(): + if filters.HasExcludes() { + for i := 0; i < len(filters.Excludes); i++ { + if strings.Contains( + filename, + filters.Excludes[i], + ) { + stats.IncrementFilesSkipped() + + return nil + } + } + } + + if filters.HasIncludes() { for i := 0; i < len(filters.Includes); i++ { if strings.Contains( filename, @@ -110,53 +122,12 @@ func appendPaths(path string, files *Files, filters *Filters, stats *Stats) erro stats.IncrementFilesSkipped() - return nil - case !filters.HasIncludes() && filters.HasExcludes(): - for i := 0; i < len(filters.Excludes); i++ { - if strings.Contains( - filename, - filters.Excludes[i], - ) { - stats.IncrementFilesSkipped() - - return nil - } - } - - appendPath(directory, path, files, stats) - - return nil - case filters.HasIncludes() && filters.HasExcludes(): - for i := 0; i < len(filters.Excludes); i++ { - if strings.Contains( - filename, - filters.Excludes[i], - ) { - stats.IncrementFilesSkipped() - - return nil - } - } - - for i := 0; i < len(filters.Includes); i++ { - if strings.Contains( - filename, - filters.Includes[i], - ) { - appendPath(directory, path, files, stats) - - return nil - } - } - - stats.IncrementFilesSkipped() - - return nil - default: - appendPath(directory, path, files, stats) - return nil } + + appendPath(directory, path, files, stats) + + return nil } func getFirstFile(p *Path) (string, error) { diff --git a/cmd/version.go b/cmd/version.go index 916351e..cdc605d 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" ) -var Version = "0.17.3" +var Version = "0.17.4" func init() { rootCmd.AddCommand(versionCmd)