Changeset 57 for trunk

Timestamp:

07/07/09 04:17:29 (3 years ago)

Author:

dom

Message:

directory_watcher now adds type info when a file or directory is lost

Location:

trunk/src

Files:

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

trunk/src/directory_watcher.erl

@@ -105 +105 @@
     compare (Pid, Xs, Ys);
 compare (Pid, [X, {F, V} | Xs], [{F, W} | Ys]) ->
-    {Filename, _} = X,
-    report_lost (Pid, Filename),
+    report_lost (Pid, X),
     compare (Pid, [{F, V} | Xs], [{F, W} | Ys]);
 compare (Pid, [{F, V} | Xs], [Y, {F, W} | Ys]) ->
@@ -117 +116 @@
     compare (Pid, [], Ys);
 compare (Pid, [X | Xs], []) ->
-    {Filename, _} = X,
-    report_lost (Pid, Filename),
+    report_lost (Pid, X),
     compare (Pid, Xs, []);
 compare (_, [], []) ->
@@ -126 +124 @@
     notify (Pid, {type (Filename), Filename, found}).
 
-report_lost (Pid, Filename) ->
-    notify (Pid, {unknown, Filename, lost}).
+report_lost (Pid, {Filename, directory}) ->
+    notify (Pid, {directory, Filename, lost});
+report_lost (Pid, {Filename, {regular, _}}) ->
+    notify (Pid, {{file, filename: extension (Filename)}, Filename, lost}).
 
 report_changed (Pid, Filename) ->

trunk/src/directory_watcher_test.erl

@@ -10 +10 @@
 -export ([bad_symlinks_are_ignored/0]).
 -export ([recursive/0]).
--export([directories_can_be_removed/0]).
--export([directories_can_be_removed_when_recursive/0]).
+-export ([directories_can_be_removed/0]).
+-export ([directories_can_be_removed_when_recursive/0]).
+-export ([change_from_directory_to_file/0]).
 
 tests_from_empty () ->
@@ -46 +47 @@
 directories_can_be_removed_when_recursive () ->
     ok = fixtures: use_tree (tree (), fun directories_can_be_removed_when_recursive/2).
+
+change_from_directory_to_file () ->
+    Tree = [{directory, "foo", []}],
+    ok = fixtures: use_tree (Tree, fun change_from_directory_to_file/2).
 
 tree () ->
@@ -64 +69 @@
     fixtures: delete_tree (Subdir), 
     Watcher ! check,
-    {unknown, Subdir, lost} = receive_one (),
+    {directory, Subdir, lost} = receive_one (),
     ok.
 
@@ -74 +79 @@
     Watcher ! check,
     File = filename: join (Subdir, "subsubfile.sub"),
-    [{unknown, File, lost}, {unknown, Subdir, lost}] = receive_all (),
+    [{{file, ".sub"}, File, lost}, {directory, Subdir, lost}] = receive_all (),
     ok.
 
@@ -128 +133 @@
     ok = file: del_dir (Subdir),
     Watcher ! check,
-    {unknown, Subdir, lost} = receive_one (),
+    {directory, Subdir, lost} = receive_one (),
 
     rewrite_same_data (Filename),
@@ -187 +192 @@
             Acc
     end.
+
+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}