Changeset 81 for trunk

Timestamp:

07/17/09 13:40:38 (3 years ago)

Author:

dom

Message:

Refactoring.

Location:

trunk

Files:

• doc/TODO (modified) (1 diff)
• src/directory_watcher.erl (modified) (4 diffs)

trunk/doc/TODO

@@ -10 +10 @@
 -----------------------
 
-What happens if you do a cd(...) in the shell while directory_tester
-is running (try with an absolute path and with a relative path in the
-init args)?
-
-Try running directory_tester from erl started with various -pa
-(relative, absolute, ../ etc).
-
 Features?
 ---------

trunk/src/directory_watcher.erl

@@ -10 +10 @@
 init (Directory, F) ->
     D = filename: absname (Directory),
-    check (D, F, []).
+    check (D, F, dict: new ()).
 
 init_recursive (Directory, F) ->
@@ -20 +20 @@
 check (Directory, F, State) ->
     New_state = list_dir (Directory, F),
-    sort_and_compare (F, State, New_state),
+    compare (F, State, New_state),
     loop (Directory, F, New_state).
 
@@ -31 +31 @@
 list_dir (Directory, F, Error) ->
     F ({directory, Directory, Error}),
-    [].
+    dict: new ().
 
 read_state (Filenames) ->
-    lists: foldl (fun read_state/2, [], Filenames).
+    lists: foldl (fun read_state/2, dict: new (), Filenames).
 
-read_state (Filename, State) ->
-    case file: read_file_info (Filename) of
+read_state (File_name, State) ->
+    case file: read_file_info (File_name) of
         {ok, Info} ->
-            [{Filename, value (Info#file_info.type, Filename)} | State];
+            Value = value (Info#file_info.type, File_name),
+            dict: store (File_name, Value, State);
         _ ->
             State
@@ -80 +81 @@
     end.
 
-sort_and_compare (F, Old, New) ->
-    Original = dict: from_list (Old),
-    Modified = dict: from_list (New),
+compare (F, Original, Modified) ->
     Compared = adlib: compare_dict (Modified, Original),
     dict: fold (fun notify_new/3, F, dict: fetch (new, Compared)),