Stop watching build dir.

cmd/serve.go

@@ -111,9 +111,14 @@ func Watch(buildPath string) {
 	defer watcher.Close()
 
 	// Starting at the root of the project, find subdirectories.
-	if err := filepath.Walk(".", watchDir(buildPath)); err != nil {
-		fmt.Println("ERROR", err)
+	if err := filepath.Walk("content", watchDir(buildPath)); err != nil {
+		fmt.Println("Watching 'content/' folder for changes error: ", err)
 	}
+	if err := filepath.Walk("layout", watchDir(buildPath)); err != nil {
+		fmt.Println("Watching 'layout/' folder for changes error: ", err)
+	}
+	watcher.Add("plenti.json")
+	watcher.Add("package.json")
 
 	done := make(chan bool)
 
@@ -133,10 +138,15 @@ func Watch(buildPath string) {
 					events = append(events, event)
 				}
 			case <-ticker.C:
+				buildDirChanged := false
 				// Checks on set interval if there are events.
 				if len(events) > 0 {
 					// Display messages for each events in batch.
 					for _, event := range events {
+						// If Mac picks up on "public" build dir changing, don't rebuild.
+						if event.Name == buildPath {
+							buildDirChanged = true
+						}
 						if event.Op&fsnotify.Write == fsnotify.Write {
 							fmt.Printf("\nFile write detected: %#v\n", event)
 						}
@@ -147,10 +157,13 @@ func Watch(buildPath string) {
 							fmt.Printf("\nFile rename detected: %#v\n", event)
 						}
 					}
-					// Rebuild only one time for all batched events.
-					Build()
-					// Empty the batch array.
-					events = make([]fsnotify.Event, 0)
+					if !buildDirChanged {
+						// Rebuild only one time for all batched events.
+						Build()
+						// Empty the batch array.
+						events = make([]fsnotify.Event, 0)
+					}
+
 				}
 
 			// Watch for errors.
@@ -170,7 +183,7 @@ func watchDir(buildPath string) filepath.WalkFunc {
 	// Callback for walk func: searches for directories to add watchers to.
 	return func(path string, fi os.FileInfo, err error) error {
 		// Skip the "public" build dir to avoid infinite loops.
-		if fi.IsDir() && fi.Name() == buildPath {
+		if fi.IsDir() && fi.Name() == buildPath || fi.Name() == "node_modules" {
 			return filepath.SkipDir
 		}
 		// Add watchers only to nested directory.