use godirwalk

Author: patrickdevivo

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/hashicorp/hcl/v2 v2.0.0
+	github.com/karrick/godirwalk v1.13.0
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5 // indirect

go.sum

@@ -54,6 +54,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/karrick/godirwalk v1.13.0 h1:GJq8GHQEAPsjwqfGhLNXBO5P0dS2HYdDRVWe+P4E/EQ=
+github.com/karrick/godirwalk v1.13.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=

pkg/comments/comments.go

@@ -10,6 +10,7 @@ import (
 	"sync"
 
 	"github.com/augmentable-dev/lege"
+	"github.com/karrick/godirwalk"
 	"github.com/src-d/enry/v2"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
@@ -105,39 +106,41 @@ func SearchFile(filePath string, reader io.Reader) (Comments, error) {
 // SearchDir searches a directory for comments
 func SearchDir(dirPath string) (Comments, error) {
 	found := make(Comments, 0)
-	// TODO let's see what we can do concurrently here to speed up the processing
-	err := filepath.Walk(dirPath, func(path string, info os.FileInfo, err error) error {
-		localPath, err := filepath.Rel(dirPath, path)
-		if err != nil {
-			return err
-		}
-		pathComponents := strings.Split(localPath, string(os.PathSeparator))
-		// let's ignore git directories TODO: figure out a more generic way to set ignores
-		matched, err := filepath.Match(".git", pathComponents[0])
-		if err != nil {
-			return err
-		}
-		if matched {
-			return nil
-		}
-		if info.Mode().IsRegular() {
-			p, err := filepath.Abs(path)
+	err := godirwalk.Walk(dirPath, &godirwalk.Options{
+		Callback: func(path string, de *godirwalk.Dirent) error {
+			localPath, err := filepath.Rel(dirPath, path)
 			if err != nil {
 				return err
 			}
-			f, err := os.Open(p)
+			pathComponents := strings.Split(localPath, string(os.PathSeparator))
+			// let's ignore git directories TODO: figure out a more generic way to set ignores
+			matched, err := filepath.Match(".git", pathComponents[0])
 			if err != nil {
 				return err
 			}
-			defer f.Close()
-			t, err := SearchFile(p, f)
-			if err != nil {
-				return err
+			if matched {
+				return nil
 			}
-			c := Comments(t)
-			found = append(found, c...)
-		}
-		return nil
+			if de.IsRegular() {
+				p, err := filepath.Abs(path)
+				if err != nil {
+					return err
+				}
+				f, err := os.Open(p)
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+				t, err := SearchFile(p, f)
+				if err != nil {
+					return err
+				}
+				c := Comments(t)
+				found = append(found, c...)
+			}
+			return nil
+		},
+		Unsorted: true,
 	})
 	if err != nil {
 		return nil, err