Changeset 50

Timestamp:

04/15/09 02:58:13 (3 years ago)

Author:

dom

Message:

Start adding recursivity to directory_watcher (with Charpi).

Location:

trunk/src

Files:

• directory_watcher.erl (modified) (1 diff)
• directory_watcher_test.erl (modified) (4 diffs)

trunk/src/directory_watcher.erl

@@ -5 +5 @@
 -module (directory_watcher).
 -export ([init/3]).
+-export ([recursive/1]).
 -include_lib ("kernel/include/file.hrl").
+
+recursive (Fun) ->
+    fun (directory, P, found, S) ->
+            spawn_link (directory_watcher, init, [P, Fun, S]);
+        (T, E, P, S) ->
+            Fun (T, E, P, S)
+    end.
 
 init (Directory, Action, Action_state) ->

trunk/src/directory_watcher_test.erl

@@ -9 +9 @@
 -export ([tests_with_several/0]).
 -export ([bad_symlinks_are_ignored/0]).
+-export ([recursive/0]).
 
 tests_from_empty () ->
@@ -36 +37 @@
     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 (Dir, _) ->
+    Notify = directory_watcher: recursive (notify ()),
+    Watcher = spawn_link (directory_watcher, init, [Dir, Notify, ignore]),
+    Filename = filename: join ([Dir, "subdir", "subfile.ext"]),
+    Expected = {watcher, {file, ".ext"}, Filename, found, ignore},
+    ok = receive_until_found (Expected).
+
 bad_symlinks_are_ignored (Dir, _) ->
     Watcher = spawn_link (directory_watcher, init, [Dir, notify (), ignore]),
@@ -53 +68 @@
     Watcher = spawn_link (directory_watcher, init, [Dir, notify (), State]),
     timeout = receive_one (),
-
+    
     Filename = filename: join (Dir, "myfile.txt"),
     ok = file: write_file (Filename, list_to_binary ("Hello")),
@@ -120 +135 @@
 receive_one () ->
     receive M -> M after 500 -> timeout end.
+
+receive_until_found (Message) ->
+    receive Message -> ok after 500 -> timeout end.