Changeset 58 for trunk

Timestamp:

07/07/09 05:37:00 (3 years ago)

Author:

dom

Message:

directory_watcher now handles a file becoming a directory and vice-versa

Location:

trunk/src

Files:

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

trunk/src/directory_watcher.erl

@@ -82 +82 @@
             notify (Pid, Event),
             loop_recursive (Directory, Pid, [Watcher | Watchers]);
-        {?MODULE, Watcher, {directory, _, {error, enoent}}} ->
+        {?MODULE, Watcher, {directory, _, {error, _}}} ->
             Watcher ! stop,
             loop_recursive (Directory, Pid, Watchers -- [Watcher]);
@@ -101 +101 @@
 compare (Pid, [X | Xs], [X | Ys]) ->
     compare (Pid, Xs, Ys);
-compare (Pid, [{F, _} | Xs], [{F, _} | Ys]) ->
+compare (Pid, [{F, {regular, _}} | Xs], [{F, {regular, _}} | Ys]) ->
     report_changed (Pid, F),
+    compare (Pid, Xs, Ys);
+compare (Pid, [{F, _}=X | Xs], [{F, _} | Ys]) ->
+    report_lost (Pid, X),
+    report_found (Pid, F),
     compare (Pid, Xs, Ys);
 compare (Pid, [X, {F, V} | Xs], [{F, W} | Ys]) ->

trunk/src/directory_watcher_test.erl

@@ -13 +13 @@
 -export ([directories_can_be_removed_when_recursive/0]).
 -export ([change_from_directory_to_file/0]).
+-export ([change_from_directory_to_file_when_recursive/0]).
+-export ([change_from_file_to_directory/0]).
+-export ([change_from_file_to_directory_when_recursive/0]).
 
 tests_from_empty () ->
@@ -46 +49 @@
 
 directories_can_be_removed_when_recursive () ->
-    ok = fixtures: use_tree (tree (), fun directories_can_be_removed_when_recursive/2).
+    F = fun directories_can_be_removed_when_recursive/2,
+    ok = fixtures: use_tree (tree (), F).
 
 change_from_directory_to_file () ->
@@ -52 +56 @@
     ok = fixtures: use_tree (Tree, fun change_from_directory_to_file/2).
 
+change_from_file_to_directory () ->
+    Tree = [{file, "foo", []}],
+    ok = fixtures: use_tree (Tree, fun change_from_file_to_directory/2).
+
+change_from_file_to_directory_when_recursive () ->
+    F = fun change_from_file_to_directory_when_recursive/2,
+    ok = fixtures: use_tree ([{file, "foo", "yo"}], F).
+
+change_from_directory_to_file_when_recursive () ->
+    F = fun change_from_directory_to_file_when_recursive/2,
+    ok = fixtures: use_tree (tree (), F).
+    
 tree () ->
     Subsub = {directory, "subsubdir",
@@ -76 +92 @@
     receive_all (),
     Subdir = filename: join ([Dir, "subdir", "subsubdir"]),
-    fixtures: delete_tree (Subdir), 
+    ok = fixtures: delete_tree (Subdir), 
     Watcher ! check,
     File = filename: join (Subdir, "subsubfile.sub"),
@@ -194 +210 @@
 
 change_from_directory_to_file (Root, [{directory, Name, []}]) ->
-    ok.
-%%     Watcher = spawn_link (directory_watcher, init, [Root, self ()]),
-%%     receive_all (),
-%%     Path = filename: join (Root, Name),
-%%     ok = file: del_dir (Path),
-%%     ok = file: write_file (Path, list_to_binary ("hello")),
-%%     Watcher ! check,
-%%     [{directory, "Name", lost}
+    Watcher = spawn_link (directory_watcher, init, [Root, self ()]),
+    receive_all (),
+    Path = filename: join (Root, Name),
+    ok = file: del_dir (Path),
+    ok = file: write_file (Path, list_to_binary ("hello")),
+    Watcher ! check,
+    [{directory, Path, lost}, {{file, ""}, Path, found}] = receive_all (),
+    ok.
+
+change_from_file_to_directory (Root, [{file, Name, []}]) ->
+    Watcher = spawn_link (directory_watcher, init, [Root, self ()]),
+    receive_all (),
+    Path = filename: join (Root, Name),
+    ok = file: delete (Path),
+    ok = file: make_dir (Path),
+    Watcher ! check,
+    [{{file, ""}, Path, lost}, {directory, Path, found}] = receive_all (),
+    ok.
+
+change_from_file_to_directory_when_recursive (Root, [{file, Name, _}]) ->
+    Watcher = spawn_link (directory_watcher, init_recursive, [Root, self ()]),
+    receive_all (),
+    Path = filename: join (Root, Name),
+    file: delete (Path),
+    ok = file: make_dir (Path),
+    Watcher ! check,
+    [{{file, ""}, Path, lost}, {directory, Path, found}] = receive_all (),
+    New_file = filename: join (Path, "new.txt"),
+    ok = file: write_file (New_file, list_to_binary ("new")),
+    Watcher ! check,
+    [{{file, ".txt"}, New_file, found}] = receive_all (),
+    ok.
+
+change_from_directory_to_file_when_recursive (Root, _) ->
+    Watcher = spawn_link (directory_watcher, init_recursive, [Root, self ()]),
+    receive_all (),
+    Subdir = filename: join ([Root, "subdir", "subsubdir"]),
+    ok = fixtures: delete_tree (Subdir),
+    ok = file: write_file (Subdir, list_to_binary ("now a file")),
+    Watcher ! check,
+    [{{file, ".sub"}, _, lost},
+     {directory, Subdir, lost},
+     {{file, ""}, Subdir, found}] = receive_all (),
+    ok.