Changeset 53 for trunk

Timestamp:

04/16/09 20:21:33 (3 years ago)

Author:

dom

Message:

Reintroduced recursivity to directory_watcher.

Location:

trunk/src

Files:

• directory_watcher.erl (modified) (2 diffs)
• directory_watcher_test.erl (modified) (3 diffs)

trunk/src/directory_watcher.erl

@@ -5 +5 @@
 -module (directory_watcher).
 -export ([init/2]).
-%% -export ([recursive/1]).
+-export ([init_recursive/2]).
 -include_lib ("kernel/include/file.hrl").
-
-%% recursive (Fun) ->
-%%     fun (directory, P, found) ->
-%%          spawn_link (directory_watcher, init, [P, Fun]);
-%%      (T, E, P) ->
-%%          Fun (T, E, P)
-%%     end.
 
 init (Directory, Pid) ->
     check (Directory, Pid, []).
+
+init_recursive (Directory, Pid) ->
+    Watcher = spawn_link (?MODULE, init, [Directory, self ()]),
+    loop_recursive (Directory, Pid, [Watcher]).
 
 check (Directory, Pid, State) ->
@@ -54 +51 @@
         check ->
             check (Directory, Pid, Filenames);
+        stop ->
+            notify (Pid, bye)
+    end.
+
+loop_recursive (Directory, Pid, Watchers) ->
+    receive
+        {?MODULE, _, {directory, Dir, found}=Event} ->
+            Watcher = spawn_link (?MODULE, init, [Dir, self ()]),
+            notify (Pid, Event),
+            loop_recursive (Directory, Pid, [Watcher | Watchers]);
+        {?MODULE, _, Event} ->
+            notify (Pid, Event),
+            loop_recursive (Directory, Pid, Watchers);
+        check ->
+            lists: foreach (fun (P) -> P ! check end, Watchers);
         stop ->
             notify (Pid, bye)

trunk/src/directory_watcher_test.erl

@@ -9 +9 @@
 -export ([tests_with_several/0]).
 -export ([bad_symlinks_are_ignored/0]).
-%% -export ([recursive/0]).
+-export ([recursive/0]).
 
 tests_from_empty () ->
@@ -36 +36 @@
     ok = fixtures: use_tree ([], fun bad_symlinks_are_ignored/2).
 
-%% recursive () ->
-%%     Tree = [{file, "foo.txt", "Hello"},
-%%          {file, "bar.txt", "G'day"},
-%%          {file, "toto.erl", "-module(toto)."},
-%%          {directory, "subdir", [{file, "subfile.ext", "toto"}]}],
-%%     ok = fixtures: use_tree (Tree, fun recursive/2).
+recursive () ->
+    Tree = [{file, "foo.txt", "Hello"},
+            {file, "bar.txt", "G'day"},
+            {file, "toto.erl", "-module(toto)."},
+            {directory, "subdir", [{file, "subfile.ext", "toto"}]}],
+    ok = fixtures: use_tree (Tree, fun recursive/2).
 
-%% recursive (Dir, _) ->
-%%     Notify = directory_watcher: recursive (notify ()),
-%%     Watcher = spawn_link (directory_watcher, init, [Dir, Notify]),
-%%     Filename = filename: join ([Dir, "subdir", "subfile.ext"]),
-%%     Expected = {watcher, {file, ".ext"}, Filename, found},
-%%     ok = receive_until_found (Expected).
+recursive (Dir, _) ->
+    Watcher = spawn_link (directory_watcher, init_recursive, [Dir, self ()]),
+    Filename = filename: join ([Dir, "subdir", "subfile.ext"]),
+    Expected = {{file, ".ext"}, Filename, found},
+    ok = receive_until_found (Expected).
 
 bad_symlinks_are_ignored (Dir, _) ->
@@ -127 +126 @@
     end.
 
-%% receive_until_found (Message) ->
-%%     receive Message -> ok after 500 -> timeout end.
+receive_until_found (Event) ->
+    receive {directory_watcher, _, Event} -> ok
+    after 500 -> timeout
+    end.