From cc846bdad1210252949d5f69bfdbd7b76d82b9d9 Mon Sep 17 00:00:00 2001
From: Dominic Breuker <dominic.breuker@gmail.com>
Date: Mon, 12 Mar 2018 08:40:30 +0100
Subject: [PATCH] refactor walker

---
 internal/fswatcher/walker/walker.go | 65 ++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/internal/fswatcher/walker/walker.go b/internal/fswatcher/walker/walker.go
index 8d8a07f..3b9668a 100644
--- a/internal/fswatcher/walker/walker.go
+++ b/internal/fswatcher/walker/walker.go
@@ -7,53 +7,78 @@ import (
 	"path/filepath"
 )
 
-type Walker struct{}
+type Walker struct {
+}
 
 func NewWalker() *Walker {
 	return &Walker{}
 }
 
+type chans struct {
+	dirCh  chan string
+	errCh  chan error
+	doneCh chan struct{}
+}
+
+func newChans() *chans {
+	return &chans{
+		dirCh:  make(chan string),
+		errCh:  make(chan error),
+		doneCh: make(chan struct{}),
+	}
+}
+
 const maxInt = int(^uint(0) >> 1)
 
 func (w *Walker) Walk(root string, depth int) (dirCh chan string, errCh chan error, doneCh chan struct{}) {
 	if depth < 0 {
 		depth = maxInt
 	}
-	dirCh = make(chan string)
-	errCh = make(chan error)
-	doneCh = make(chan struct{})
+	c := newChans()
 
 	go func() {
 		defer close(dirCh)
-		descent(root, depth-1, dirCh, errCh, doneCh)
+		descent(root, depth-1, c)
 	}()
-	return dirCh, errCh, doneCh
+	return c.dirCh, c.errCh, c.doneCh
 }
 
-func descent(dir string, depth int, dirCh chan string, errCh chan error, doneCh chan struct{}) {
-	_, err := os.Stat(dir)
-	if err != nil {
-		errCh <- fmt.Errorf("visiting %s: %v", dir, err)
-		return
-	}
-	select {
-	case dirCh <- dir:
-	case <-doneCh:
-		return
-	}
-	if depth < 0 {
+func descent(dir string, depth int, c *chans) {
+	if done := emitDir(dir, depth, c); done {
 		return
 	}
 
+	handleSubDirs(dir, depth, c)
+}
+
+func emitDir(dir string, depth int, c *chans) bool {
+	_, err := os.Stat(dir)
+	if err != nil {
+		c.errCh <- fmt.Errorf("visiting %s: %v", dir, err)
+		return true
+	}
+	select {
+	case c.dirCh <- dir:
+	case <-c.doneCh:
+		return true
+	}
+	if depth < 0 {
+		return true
+	}
+
+	return false
+}
+
+func handleSubDirs(dir string, depth int, c *chans) {
 	ls, err := ioutil.ReadDir(dir)
 	if err != nil {
-		errCh <- fmt.Errorf("opening dir %s: %v", dir, err)
+		c.errCh <- fmt.Errorf("opening dir %s: %v", dir, err)
 	}
 
 	for _, e := range ls {
 		if e.IsDir() {
 			newDir := filepath.Join(dir, e.Name())
-			descent(newDir, depth-1, dirCh, errCh, doneCh)
+			descent(newDir, depth-1, c)
 		}
 	}
 }