WIP: Begin to add capability to determine MKDIR events and scan folde…

…r contents.

cmd/watch.go

@@ -138,6 +138,7 @@ func registerMultiConsumers() {
 		pw.Register(&pc)
 	}
 
+	log.Println("Observing")
 	pw.Observe()
 }
 

event/event.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"log"
 	"os"
+
+	"github.com/cian911/switchboard/utils"
 )
 
 // Event is a struct that holds the information for a file event
@@ -36,3 +38,11 @@ func (e *Event) IsValidEvent(ext string) bool {
 
 	return false
 }
+
+func (e *Event) IsNewDirEvent() bool {
+	if e.Ext == "" && utils.ValidatePath(e.Path) {
+		return true
+	}
+
+	return false
+}

event/event_test.go

@@ -60,6 +60,19 @@ func TestEvent(t *testing.T) {
 			log.Fatal("event.Move() should have thrown error but didn't.")
 		}
 	})
+
+	t.Run("It determines if the event is a new dir", func(t *testing.T) {
+		event := eventSetup(t)
+		event.File = "input"
+		event.Ext = ""
+
+		want := true
+		got := event.IsNewDirEvent()
+
+		if want != got {
+			t.Errorf("Wanted new dir event but didn't get it: want=%t, got=%t", want, got)
+		}
+	})
 }
 
 func eventSetup(t *testing.T) *Event {

utils/utils.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -31,3 +32,17 @@ func ValidateFileExt(ext string) bool {
 
 	return true
 }
+
+func ScanFilesInDir(path string) (map[string]string, error) {
+	files, err := ioutil.ReadDir(path)
+	if err != nil {
+		return nil, err
+	}
+
+	fileList := map[string]string{}
+	/* for _, file := range files { */
+	/*      */
+	/* } */
+
+	return fileList, nil
+}

watcher/watcher.go

@@ -71,7 +71,14 @@ func (pc *PathConsumer) Receive(path, ev string) {
 
 	if e.IsValidEvent(pc.Ext) {
 		log.Println("Event is valid")
-		pc.Process(e)
+
+		if e.IsNewDirEvent() {
+			log.Println("Event is a new dir")
+			// Recursively scan dir for items with our ext
+			// Then add all recursive dirs as paths
+		} else {
+			pc.Process(e)
+		}
 	}
 }