WATCH: Add support for multiple pubs/subs via config file.

cmd/watch.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/cian911/switchboard/utils"
 	"github.com/cian911/switchboard/watcher"
+	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -38,24 +39,11 @@ func Watch() {
 		Long:  longDesc,
 		Run: func(cmd *cobra.Command, args []string) {
 			if viper.ConfigFileUsed() != "" && ws.Watchers != nil {
-				// Do something with a loop here.
+				registerMultiConsumers()
 			} else {
 				validateFlags()
-
-				var pw watcher.Producer = &watcher.PathWatcher{
-					Path: viper.GetString("path"),
-				}
-
-				var pc watcher.Consumer = &watcher.PathConsumer{
-					Path:        viper.GetString("path"),
-					Destination: viper.GetString("destination"),
-					Ext:         viper.GetString("ext"),
-				}
-
-				pw.Register(&pc)
-				pw.Observe()
+				registerSingleConsumer()
 			}
-
 		},
 	}
 
@@ -113,3 +101,46 @@ func validateFlags() {
 		log.Fatalf("Ext is not valid. A file extention should contain a '.': %s", viper.GetString("ext"))
 	}
 }
+
+func registerMultiConsumers() {
+	watch, _ := fsnotify.NewWatcher()
+	var pw watcher.Producer = &watcher.PathWatcher{
+		Watcher: *watch,
+	}
+
+	for i, v := range ws.Watchers {
+		if i == 0 {
+			// Register the path and create the watcher
+			pw.(*watcher.PathWatcher).Path = v.Path
+		} else {
+			// Add paths to this watcher, so as we don't spawn multiple
+			// watcher instances.
+			pw.(*watcher.PathWatcher).AddPath(v.Path)
+		}
+
+		var pc watcher.Consumer = &watcher.PathConsumer{
+			Path:        v.Path,
+			Destination: v.Destination,
+			Ext:         v.Ext,
+		}
+
+		pw.Register(&pc)
+	}
+
+	pw.Observe()
+}
+
+func registerSingleConsumer() {
+	var pw watcher.Producer = &watcher.PathWatcher{
+		Path: viper.GetString("path"),
+	}
+
+	var pc watcher.Consumer = &watcher.PathConsumer{
+		Path:        viper.GetString("path"),
+		Destination: viper.GetString("destination"),
+		Ext:         viper.GetString("ext"),
+	}
+
+	pw.Register(&pc)
+	pw.Observe()
+}

watcher/watcher.go

@@ -59,6 +59,10 @@ func (pc *PathConsumer) Process(e *event.Event) {
 	log.Println("Event has been processed.")
 }
 
+func (pw *PathWatcher) AddPath(path string) {
+	pw.Watcher.Add(path)
+}
+
 func (pw *PathWatcher) Register(consumer *Consumer) {
 	pw.Consumers = append(pw.Consumers, consumer)
 }
@@ -72,12 +76,6 @@ func (pw *PathWatcher) Unregister(consumer *Consumer) {
 	}
 }
 
-func (pw *PathWatcher) notify(path, event string) {
-	for _, cons := range pw.Consumers {
-		(*cons).Receive(path, event)
-	}
-}
-
 func (pw *PathWatcher) Observe() {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
@@ -88,6 +86,10 @@ func (pw *PathWatcher) Observe() {
 
 	// fsnotify doesnt support recursive folders, so we can here
 	if err := filepath.Walk(pw.Path, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			log.Fatalf("Error walking path structure. Please ensure to use absolute path: %v", err)
+		}
+
 		if info.Mode().IsDir() {
 			watcher.Add(path)
 		}
@@ -112,3 +114,9 @@ func (pw *PathWatcher) Observe() {
 
 	<-done
 }
+
+func (pw *PathWatcher) notify(path, event string) {
+	for _, cons := range pw.Consumers {
+		(*cons).Receive(path, event)
+	}
+}