add working watcher implementation

Author: facchinm

client/client.go

@@ -79,9 +79,9 @@ func main() {
 		Verbose:               true,
 		WarningsLevel:         "all",
 		BuildCachePath:        "/tmp/arduino_cache_761418/",
-		CodeCompleteAt:        "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino:1:1",
+		CodeCompleteAt:        "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino:56:9",
 	}
 
-	build(client, &exampleParames)
-	//autocomplete(client, &exampleParames)
+	//build(client, &exampleParames)
+	autocomplete(client, &exampleParames)
 }

grpc/rpc.go

@@ -9,6 +9,7 @@ import (
 
 	builder "github.com/arduino/arduino-builder"
 	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/fsnotify/fsnotify"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -50,6 +51,24 @@ type builderServer struct {
 	watcher *fsnotify.Watcher
 }
 
+func (s *builderServer) watch() {
+	folders := [][]string{s.ctx.HardwareFolders, s.ctx.ToolsFolders, s.ctx.BuiltInLibrariesFolders, s.ctx.OtherLibrariesFolders}
+
+	for _, category := range folders {
+		for _, folder := range category {
+			if !utils.SliceContains(s.ctx.WatchedLocations, folder) {
+				var subfolders []string
+				utils.FindAllSubdirectories(folder, &subfolders)
+				subfolders = append(subfolders, folder)
+				for _, element := range subfolders {
+					s.watcher.Add(element)
+					s.ctx.WatchedLocations = utils.AppendIfNotPresent(s.ctx.WatchedLocations, element)
+				}
+			}
+		}
+	}
+}
+
 // GetFeature returns the feature at the given point.
 func (s *builderServer) Autocomplete(ctx context.Context, args *pb.BuildParams) (*pb.Response, error) {
 
@@ -75,6 +94,8 @@ func (s *builderServer) Autocomplete(ctx context.Context, args *pb.BuildParams)
 
 	s.ctx.ImportedLibraries = s.ctx.ImportedLibraries[0:0]
 
+	s.watch()
+
 	err := builder.RunPreprocess(s.ctx)
 	if err != nil {
 		return &pb.Response{Line: s.ctx.GetLogger().Flush()}, err
@@ -114,6 +135,8 @@ func (s *builderServer) Build(args *pb.BuildParams, stream pb.Builder_BuildServe
 	logger := StreamLogger{stream}
 	s.ctx.SetLogger(logger)
 
+	s.watch()
+
 	err := builder.RunBuilder(s.ctx)
 	s.ctx.SetLogger(oldlogger)
 	if err != nil {

types/context.go

@@ -15,6 +15,7 @@ type Context struct {
 	LibrariesFolders        []string
 	BuiltInLibrariesFolders []string
 	OtherLibrariesFolders   []string
+	WatchedLocations        []string
 	SketchLocation          string
 	ArduinoAPIVersion       string
 	FQBN                    string

utils/utils.go

@@ -325,6 +325,30 @@ func FilterOutFoldersByNames(folders []os.FileInfo, names ...string) []os.FileIn
 
 type CheckExtensionFunc func(ext string) bool
 
+func FindAllSubdirectories(folder string, output *[]string) error {
+	walkFunc := func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Skip source control and hidden files and directories
+		if IsSCCSOrHiddenFile(info) {
+			if info.IsDir() {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+
+		// Skip directories unless recurse is on, or this is the
+		// root directory
+		if info.IsDir() {
+			*output = AppendIfNotPresent(*output, path)
+		}
+		return nil
+	}
+	return gohasissues.Walk(folder, walkFunc)
+}
+
 func FindFilesInFolder(files *[]string, folder string, extensions CheckExtensionFunc, recurse bool) error {
 	walkFunc := func(path string, info os.FileInfo, err error) error {
 		if err != nil {