Changeset 56 for trunk

Timestamp:

07/06/09 11:50:16 (3 years ago)

Author:

dom

Message:

Added clean removal of subdirectories to directory_watcher.

Location:

trunk/src

Files:

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

trunk/src/directory_watcher.erl

@@ -6 +6 @@
 -export ([init/2]).
 -export ([init_recursive/2]).
+-export([start_io/2]).
+-export([start_io/0]).
 -include_lib ("kernel/include/file.hrl").
+
+start_io () ->
+    start_io (".", 3000).
+
+start_io (Dir, Interval) ->
+    Watcher = spawn_link (?MODULE, init_recursive, [Dir, self ()]),
+    io_loop (Interval, Watcher).
+
+io_loop (Interval, Watcher) ->
+    Watcher ! check,
+    receive
+        {directory_watcher, _, Event} ->
+            io: fwrite ("~p~n", [Event]),
+            io_loop (Interval, Watcher);
+        stop ->
+            bye
+    after Interval ->
+            io_loop (Interval, Watcher)
+    end.
 
 init (Directory, Pid) ->
@@ -16 +37 @@
 
 check (Directory, Pid, State) ->
-    New_state = list_dir (Directory, Pid, State),
+    New_state = list_dir (Directory, Pid),
     compare (Pid, State, New_state),
     loop (Directory, Pid, New_state).
 
-list_dir (Directory, Pid, State) ->
-    list_dir (Directory, Pid, State, file: list_dir (Directory)).
+list_dir (Directory, Pid) ->
+    list_dir (Directory, Pid, file: list_dir (Directory)).
 
-list_dir (Directory, _, _, {ok, Filenames}) ->
+list_dir (Directory, _, {ok, Filenames}) ->
     Paths = [filename: join (Directory, F) || F <- Filenames],
     read_state (Paths);
-list_dir (Directory, Pid, State, Error) ->
+list_dir (Directory, Pid, Error) ->
     notify (Pid, {directory, Directory, Error}),
-    State.
+    [].
 
 read_state (Filenames) ->
@@ -61 +82 @@
             notify (Pid, Event),
             loop_recursive (Directory, Pid, [Watcher | Watchers]);
+        {?MODULE, Watcher, {directory, _, {error, enoent}}} ->
+            Watcher ! stop,
+            loop_recursive (Directory, Pid, Watchers -- [Watcher]);
+        {?MODULE, _, bye} ->
+            loop_recursive (Directory, Pid, Watchers);
         {?MODULE, _, Event} ->
             notify (Pid, Event),

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]).
 
 tests_from_empty () ->
@@ -37 +39 @@
 
 recursive () ->
+    ok = fixtures: use_tree (tree (), fun recursive/2).
+
+directories_can_be_removed () ->
+    ok = fixtures: use_tree (tree (), fun directories_can_be_removed/2).
+
+directories_can_be_removed_when_recursive () ->
+    ok = fixtures: use_tree (tree (), fun directories_can_be_removed_when_recursive/2).
+
+tree () ->
     Subsub = {directory, "subsubdir",
               [{file, "subsubfile.sub", "titi"}]},
@@ -45 +56 @@
              [{file, "subfile.ext", "toto"},
               Subsub]}],
-    ok = fixtures: use_tree (Tree, fun recursive/2).
+    Tree.
+
+directories_can_be_removed (Dir, _) ->    
+    Watcher = spawn_link (directory_watcher, init, [Dir, self ()]),
+    receive_all (),
+    Subdir = filename: join (Dir, "subdir"),
+    fixtures: delete_tree (Subdir), 
+    Watcher ! check,
+    {unknown, Subdir, lost} = receive_one (),
+    ok.
+
+directories_can_be_removed_when_recursive (Dir, _) ->    
+    Watcher = spawn_link (directory_watcher, init_recursive, [Dir, self ()]),
+    receive_all (),
+    Subdir = filename: join ([Dir, "subdir", "subsubdir"]),
+    fixtures: delete_tree (Subdir), 
+    Watcher ! check,
+    File = filename: join (Subdir, "subsubfile.sub"),
+    [{unknown, File, lost}, {unknown, Subdir, lost}] = receive_all (),
+    ok.
 
 recursive (Dir, _) ->
@@ -147 +177 @@
     after 500 -> timeout
     end.
+
+receive_all () ->
+    lists: reverse (receive_all ([])).
+
+receive_all (Acc) ->
+    receive {directory_watcher, _, Event} ->
+            receive_all ([Event | Acc])
+    after 500 ->
+            Acc
+    end.