Walk watchFolder default directories and add watch

conf/config.py

@@ -16,6 +16,7 @@ BASE_PATH = "/space/projects/live-viewer"
 class defaultConfigSender():
 
     # folder you want to monitor for changes
+    # inside this folder only the subdirectories "commissioning", "current" and "local" are monitored
     watchFolder         = BASE_PATH + "/data/source/"
     # Target to move the files into
     cleanerTargetPath   = BASE_PATH + "/data/target/"

src/ZeroMQTunnel/watcher.py

@@ -45,7 +45,7 @@ class DirectoryWatcher():
         self.fileEventIp         = fileEventIp
         self.fileEventPort       = fileEventPort
 
-        monitoredFolders         = [self.watchFolder + os.sep + folder for folder in self.monitoredDefaultSubfolders]
+        monitoredFolders         = self.getDirectoryStructure()
         self.eventDetector       = EventDetector(monitoredFolders)
 
         assert isinstance(self.zmqContext, zmq.sugar.context.Context)
@@ -64,6 +64,22 @@ class DirectoryWatcher():
         return logger
 
 
+    def getDirectoryStructure(self):
+        # Add the default subfolders
+        foldersToWalk    = [self.watchFolder + os.sep + folder for folder in self.monitoredDefaultSubfolders]
+        monitoredFolders = []
+
+        # Walk the tree
+        for folder in foldersToWalk:
+            for root, directories, files in os.walk(folder):
+                # Add the found folders to the list for the inotify-watch
+                monitoredFolders.append(root)
+                self.log.info("Add folder to monitor: " + str(root))
+                print "Add folder to monitor: " + str(root)
+
+        return monitoredFolders
+
+
     def passFileToZeromq(self, targetSocket, sourcePath, relativePath, filename):
         '''
         Taking the filename, creating a buffer and then