feat: allow multiple roots

gofind/app.go

@@ -66,18 +66,22 @@ func (gf *GoFind) Run(entry string) ([]Match, error) {
 
 func (gf *GoFind) SearchFor(search SearchEntry) []Match {
 	var matches []Match
-	var p = ParsePath(search.Root)
+
+	paths := make([]string, len(search.Roots))
+	for i, root := range search.Roots {
+		paths[i] = ParsePath(root)
+	}
 
 	finder := Finder{
 		MaxRecursion: 5,
 		Ignore:       gf.Conf.Ignore,
 	}
 
-	var results = Must(finder.Find(p, search.MatchStr))
+	var results = Must(finder.Find(paths, search.MatchStr))
 
 	if len(results) == 0 {
-		yal.Warnf("no results found for path %s", search.Root)
-		yal.Debugf("gf.SearchFor(Root=%s, MatchStr=%s) returned no results", search.Root, search.MatchStr)
+		yal.Warnf("no results found for path %s", search.Roots)
+		yal.Debugf("gf.SearchFor(Root=%s, MatchStr=%s) returned no results", search.Roots, search.MatchStr)
 		return matches
 	}
 
@@ -97,4 +101,3 @@ func (gf *GoFind) SearchFor(search SearchEntry) []Match {
 
 	return matches
 }
-

gofind/config.go

@@ -17,8 +17,8 @@ type Config struct {
 }
 
 type SearchEntry struct {
-	Root     string `json:"root"`
-	MatchStr string `json:"match"`
+	Roots    []string `json:"roots"`
+	MatchStr string   `json:"match"`
 }
 
 func ConfigSetup() error {

gofind/finder.go

@@ -58,7 +58,6 @@ func (fdr *Finder) DirWalker(channel chan string, root string, pattern string) {
 
 func (fdr *Finder) FindAll(wg *sync.WaitGroup, channel chan string, root string, pattern string) {
 	defer wg.Done()
-	defer close(channel)
 
 	fdr.DirWalker(channel, root, pattern)
 
@@ -73,20 +72,27 @@ func (fdr *Finder) CollectResults(wg *sync.WaitGroup, channel chan string, resul
 
 }
 
-func (fdr *Finder) Find(path string, glob string) ([]string, error) {
+func (fdr *Finder) Find(path []string, glob string) ([]string, error) {
 	var (
 		matches = []string{}
 		results = make(chan string)
 	)
 
-	wg := sync.WaitGroup{}
+	finderWg := sync.WaitGroup{}
+	finderWg.Add(len(path))
 
-	wg.Add(2)
+	for _, root := range path {
+		go fdr.FindAll(&finderWg, results, root, glob)
+	}
+
+	collectWg := sync.WaitGroup{}
+	collectWg.Add(1)
 
-	go fdr.FindAll(&wg, results, path, glob)
-	go fdr.CollectResults(&wg, results, &matches)
+	go fdr.CollectResults(&collectWg, results, &matches)
 
-	wg.Wait()
+	finderWg.Wait()
+	close(results)
 
+	collectWg.Wait()
 	return matches, nil
 }

main.go

@@ -111,13 +111,13 @@ func main() {
 
 							key := c.Args().Get(0)
 							entry := gofind.SearchEntry{
-								Root:     c.Args().Get(1),
+								Roots:    []string{c.Args().Get(1)}, //TODO: Let user setup multiple roots!
 								MatchStr: c.Args().Get(2),
 							}
 							cfg.Commands[key] = entry
 							cfg.Save()
 
-							yal.Infof("Key=%s, Root=%s, MatchStr=%s", key, entry.Root, entry.MatchStr)
+							yal.Infof("Key=%s, Root=%s, MatchStr=%s", key, entry.Roots, entry.MatchStr)
 							yal.Info("config entry added successfully")
 							return nil
 						},
@@ -179,7 +179,7 @@ func main() {
 							}
 
 							for key, entry := range cfg.Commands {
-								items = append(items, []string{key, entry.Root, entry.MatchStr})
+								items = append(items, []string{key, strings.Join(entry.Roots, ", "), entry.MatchStr})
 							}
 
 							str.WriteString(ui.Table(items))