Changeset 80 for trunk/src/directory_watcher.erl

Timestamp:

07/17/09 13:31:39 (3 years ago)

Author:

dom

Message:

Fixed more bugs in directory_watcher.

File:

• trunk/src/directory_watcher.erl (modified) (3 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, F) ->
-    check (Directory, F, []).
+    D = filename: absname (Directory),
+    check (D, F, []).
 
 init_recursive (Directory, F) ->
+    D = filename: absname (Directory),
     Self = self (),
-    Watcher = spawn_link (?MODULE, init, [Directory, send (Self)]),
-    loop_recursive (Directory, F, [Watcher]).
+    Watcher = spawn_link (?MODULE, init, [D, send (Self)]),
+    loop_recursive (D, F, [Watcher]).
 
 check (Directory, F, State) ->
     New_state = list_dir (Directory, F),
-    compare (F, State, New_state),
+    sort_and_compare (F, State, New_state),
     loop (Directory, F, New_state).
 
@@ -99 +80 @@
     end.
 
-compare (_, State, State) ->
-    done;
-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 (Fun, Filename),
-    compare (Fun, [{F, V} | Xs], [{F, W} | Ys]);
-compare (Fun, [], [Y | Ys]) ->
-    {Filename, _} = Y,
-    report_found (Fun, Filename),
-    compare (Fun, [], Ys);
-compare (Fun, [X | Xs], []) ->
-    report_lost (Fun, X),
-    compare (Fun, Xs, []);
-compare (Fun, [X], [Y]) ->
-    report_lost (Fun, X),
-    {File, _} = Y,
-    report_found (Fun, File),
-    done;
-compare (_, [], []) ->
+sort_and_compare (F, Old, New) ->
+    Original = dict: from_list (Old),
+    Modified = dict: from_list (New),
+    Compared = adlib: compare_dict (Modified, Original),
+    dict: fold (fun notify_new/3, F, dict: fetch (new, Compared)),
+    dict: fold (fun notify_lost/3, F, dict: fetch (lost, Compared)),
+    dict: fold (fun notify_changed/3, F, dict: fetch (changed, Compared)),
     done.
+    
+notify_new (File_name, _, Fun) ->
+    report_found (Fun, File_name),
+    Fun.
 
 report_found (F, Filename) ->
     F ({type (Filename), Filename, found}).
+
+notify_lost (File_name, Value, Fun) ->
+    report_lost (Fun, {File_name, Value}),
+    Fun.
 
 report_lost (F, {Filename, directory}) ->
@@ -139 +104 @@
 report_lost (F, {Filename, {regular, _}}) ->
     F ({{file, filename: extension (Filename)}, Filename, lost}).
+
+notify_changed (File_name, {{regular, _}, {regular, _}}, Fun) ->
+    report_changed (Fun, File_name),
+    Fun;
+notify_changed (File_name, {_, Original}, Fun) ->
+    report_lost (Fun, {File_name, Original}),
+    report_found (Fun, File_name),
+    Fun.
 
 report_changed (F, Filename) ->