Changeset 11 for trunk

Timestamp:

11/11/07 17:01:23 (5 years ago)

Author:

dom

Message:

Refactoring: move file_monitor creation into forge module

Location:

trunk/src

Files:

• forge.erl (modified) (1 diff)
• test_files_acceptance.erl (modified) (2 diffs)

trunk/src/forge.erl

@@ -12 +12 @@
 init() ->
     process_flag (trap_exit, true),
-    loop ([], new(), dashboard:new()).
+    loop ([], new(), dashboard:new(), []).
 
-loop (Listeners, Smiths, Dashboard) ->
+loop (Listeners, Smiths, Dashboard, Monitors) ->
     receive
         stop ->
-            bye;
+            [file_monitor:stop (M) || M <- Monitors];
+        {monitor_files, File_system, Dir} ->
+            Forge = self(),
+            Tell_server = fun (Event, File_name, _) -> Forge ! {Event, File_name} end,
+            loop (Listeners, Smiths, Dashboard, [file_monitor:start (File_system, Dir, Tell_server)]);
         {add_event_handler, F} ->
-            loop ([F | Listeners], Smiths, Dashboard);
-        {_, found, File, _} ->
+            loop ([F | Listeners], Smiths, Dashboard, Monitors);
+        {found, File} ->
             Smith = file_handler (filename:extension (File), File),
-            loop (Listeners, add_smith (File, Smith, Smiths), Dashboard);
-        {_, modified, File, _} ->
+            loop (Listeners, add_smith (File, Smith, Smiths), Dashboard, Monitors);
+        {modified, File} ->
             Smith = fetch (File, Smiths),
             Smith ! {self(), modified},
-            loop (Listeners, Smiths, Dashboard);
+            loop (Listeners, Smiths, Dashboard, Monitors);
         {_, _, _, Status, _} = Event ->
             New_dashboard = dashboard:update (Status, Dashboard),
             notify (Event, New_dashboard, Listeners),
-            loop (Listeners, Smiths, New_dashboard)
+            loop (Listeners, Smiths, New_dashboard, Monitors)
     end.
 

trunk/src/test_files_acceptance.erl

@@ -15 +15 @@
               Server = forge:start (),
               Server ! {add_event_handler, fun (Event) -> Listener ! {self (), Event} end},
-              Tell_server = fun (Event, File_name, FS) -> Server ! {self (), Event, File_name, FS} end,
-              Monitor = file_monitor:start (File_system, Dir, Tell_server),
+              Server ! {monitor_files, File_system, Dir},
               try
                   Test (Server, Dir, File_system),
@@ -22 +21 @@
                   ok
               after
-                  Server ! stop,
-                  file_monitor:stop (Monitor)
+                  Server ! stop
               end
       end).