Add recursive directory handling to inotify watcher

pierredup · pierredup · commit bdcd781abec1 · 2019-11-26T15:02:57.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Watcher/INotifyWatcher.php b/src/Symfony/Component/Filesystem/Watcher/INotifyWatcher.php
@@ -31,11 +31,16 @@ public function watch($path, callable $callback, float $timeout = null)
         stream_set_blocking($inotifyInit, false);
 
         $isDir = is_dir($path);
+        $watchers = [];
 
         if ($isDir) {
-            $watchId = inotify_add_watch($inotifyInit, $path, IN_CREATE | IN_DELETE | IN_MODIFY);
+            $watchers[] = inotify_add_watch($inotifyInit, $path, IN_CREATE | IN_DELETE | IN_MODIFY);
+
+            foreach ($this->scanPath("$path/*") as $path) {
+                $watchers[] = inotify_add_watch($inotifyInit, $path, IN_CREATE | IN_DELETE | IN_MODIFY);
+            }
         } else {
-            $watchId = inotify_add_watch($inotifyInit, $path, IN_MODIFY);
+            $watchers[] = inotify_add_watch($inotifyInit, $path, IN_MODIFY);
         }
 
         try {
@@ -77,8 +82,19 @@ public function watch($path, callable $callback, float $timeout = null)
                 }
             }
         } finally {
-            inotify_rm_watch($inotifyInit, $watchId);
+            foreach ($watchers as $watchId) {
+                inotify_rm_watch($inotifyInit, $watchId);
+            }
+
             fclose($inotifyInit);
         }
     }
+
+    private function scanPath($path)
+    {
+        foreach (glob($path, GLOB_ONLYDIR) as $directory) {
+            yield $directory;
+            yield from $this->scanPath("$directory/*");
+        }
+    }
 }
