Changeset 59 for trunk

Timestamp:

07/07/09 11:47:43 (3 years ago)

Author:

dom

Message:

Refactored directory_watcher to take a fun instead of a pid

File:

• trunk/src/directory_watcher.erl (modified) (3 diffs)

trunk/src/directory_watcher.erl

@@ -29 +29 @@
     end.
 
-init (Directory, Pid) ->
-    check (Directory, Pid, []).
+init (Directory, Pid) when is_pid (Pid) ->
+    init (Directory, send (Pid));
+init (Directory, F) ->
+    check (Directory, F, []).
 
-init_recursive (Directory, Pid) ->
-    Watcher = spawn_link (?MODULE, init, [Directory, self ()]),
-    loop_recursive (Directory, Pid, [Watcher]).
+init_recursive (Directory, Pid) when is_pid (Pid) ->
+    init_recursive (Directory, send (Pid));
+init_recursive (Directory, F) ->
+    S = self (),
+    Watcher = spawn_link (?MODULE, init, [Directory, S]),
+    loop_recursive (Directory, F, [Watcher]).
 
-check (Directory, Pid, State) ->
-    New_state = list_dir (Directory, Pid),
-    compare (Pid, State, New_state),
-    loop (Directory, Pid, New_state).
+check (Directory, F, State) ->
+    New_state = list_dir (Directory, F),
+    compare (F, State, New_state),
+    loop (Directory, F, New_state).
 
-list_dir (Directory, Pid) ->
-    list_dir (Directory, Pid, file: list_dir (Directory)).
+list_dir (Directory, F) ->
+    list_dir (Directory, F, file: list_dir (Directory)).
 
 list_dir (Directory, _, {ok, Filenames}) ->
     Paths = [filename: join (Directory, F) || F <- Filenames],
     read_state (Paths);
-list_dir (Directory, Pid, Error) ->
-    notify (Pid, {directory, Directory, Error}),
+list_dir (Directory, F, Error) ->
+    F ({directory, Directory, Error}),
     [].
 
@@ -68 +73 @@
     directory.
 
-loop (Directory, Pid, Filenames) ->
+loop (Directory, F, Filenames) ->
     receive
         check ->
-            check (Directory, Pid, Filenames);
+            check (Directory, F, Filenames);
         stop ->
-            notify (Pid, bye)
+            F (bye)
     end.
 
-loop_recursive (Directory, Pid, Watchers) ->
+loop_recursive (Directory, F, Watchers) ->
     receive
         {?MODULE, _, {directory, Dir, found}=Event} ->
-            Watcher = spawn_link (?MODULE, init, [Dir, self ()]),
-            notify (Pid, Event),
-            loop_recursive (Directory, Pid, [Watcher | Watchers]);
+            Self = self (),
+            Watcher = spawn_link (?MODULE, init, [Dir, send (Self)]),
+            F (Event),
+            loop_recursive (Directory, F, [Watcher | Watchers]);
         {?MODULE, Watcher, {directory, _, {error, _}}} ->
             Watcher ! stop,
-            loop_recursive (Directory, Pid, Watchers -- [Watcher]);
+            loop_recursive (Directory, F, Watchers -- [Watcher]);
         {?MODULE, _, bye} ->
-            loop_recursive (Directory, Pid, Watchers);
+            loop_recursive (Directory, F, Watchers);
         {?MODULE, _, Event} ->
-            notify (Pid, Event),
-            loop_recursive (Directory, Pid, Watchers);
+            F (Event),
+            loop_recursive (Directory, F, Watchers);
         check ->
             lists: foreach (fun (P) -> P ! check end, Watchers),
-            loop_recursive (Directory, Pid, Watchers);
+            loop_recursive (Directory, F, Watchers);
         stop ->
-            notify (Pid, bye)
+            F (bye)
     end.
 
 compare (_, State, State) ->
     done;
-compare (Pid, [X | Xs], [X | Ys]) ->
-    compare (Pid, Xs, 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]) ->
-    report_lost (Pid, X),
-    compare (Pid, [{F, V} | Xs], [{F, W} | Ys]);
-compare (Pid, [{F, V} | Xs], [Y, {F, W} | Ys]) ->
+compare (Fun, [X | Xs], [X | Ys]) ->
+    compare (Fun, Xs, Ys);
+compare (Fun, [{F, {regular, _}} | Xs], [{F, {regular, _}} | Ys]) ->
+    report_changed (Fun, F),
+    compare (Fun, Xs, Ys);
+compare (Fun, [{F, _}=X | Xs], [{F, _} | Ys]) ->
+    report_lost (Fun, X),
+    report_found (Fun, F),
+    compare (Fun, Xs, Ys);
+compare (Fun, [X, {F, V} | Xs], [{F, W} | Ys]) ->
+    report_lost (Fun, X),
+    compare (Fun, [{F, V} | Xs], [{F, W} | Ys]);
+compare (Fun, [{F, V} | Xs], [Y, {F, W} | Ys]) ->
     {Filename, _} = Y,
-    report_found (Pid, Filename),
-    compare (Pid, [{F, V} | Xs], [{F, W} | Ys]);
-compare (Pid, [], [Y | Ys]) ->
+    report_found (Fun, Filename),
+    compare (Fun, [{F, V} | Xs], [{F, W} | Ys]);
+compare (Fun, [], [Y | Ys]) ->
     {Filename, _} = Y,
-    report_found (Pid, Filename),
-    compare (Pid, [], Ys);
-compare (Pid, [X | Xs], []) ->
-    report_lost (Pid, X),
-    compare (Pid, Xs, []);
+    report_found (Fun, Filename),
+    compare (Fun, [], Ys);
+compare (Fun, [X | Xs], []) ->
+    report_lost (Fun, X),
+    compare (Fun, Xs, []);
 compare (_, [], []) ->
     done.
 
-report_found (Pid, Filename) ->
-    notify (Pid, {type (Filename), Filename, found}).
+report_found (F, Filename) ->
+    F ({type (Filename), Filename, found}).
 
-report_lost (Pid, {Filename, directory}) ->
-    notify (Pid, {directory, Filename, lost});
-report_lost (Pid, {Filename, {regular, _}}) ->
-    notify (Pid, {{file, filename: extension (Filename)}, Filename, lost}).
+report_lost (F, {Filename, directory}) ->
+    F ({directory, Filename, lost});
+report_lost (F, {Filename, {regular, _}}) ->
+    F ({{file, filename: extension (Filename)}, Filename, lost}).
 
-report_changed (Pid, Filename) ->
-    notify (Pid, {type (Filename), Filename, changed}).
+report_changed (F, Filename) ->
+    F ({type (Filename), Filename, changed}).
     
 type (Path) ->
@@ -144 +150 @@
     {file, filename: extension (Path)}.
 
-notify (Pid, Event) ->
-    Pid ! {?MODULE, self (), Event}.
+send (Pid) ->
+    fun (Event) ->
+            Pid ! {?MODULE, self (), Event}
+    end.
+