Working on automatic rmdom for bad domains during regen

[hcoop/domtool2.git] / src / slave.sml

diff --git a/src/slave.sml b/src/slave.sml
index b0148f1..01d872c 100644 (file)
--- a/src/slave.sml
+++ b/src/slave.sml
@@ -22,9 +22,12 @@ structure Slave :> SLAVE = struct
 
 datatype file_action =
         Add
-       | Delete
+       | Delete of bool
        | Modify
 
+fun isDelete (Delete _) = true
+  | isDelete _ = false
+
 type file_status = {action : file_action,
                    domain : string,
                    dir : string,
@@ -56,7 +59,15 @@ fun registerPostHandler handler =
     end
 
 fun handleChanges fs = (!preHandler ();
-                       app (!fileHandler) fs;
+                       app (fn recd as {action, file, ...} =>
+                               (!fileHandler recd;
+                                case action of
+                                    Delete b =>
+                                    if b andalso Posix.FileSys.access (file, []) then
+                                        OS.FileSys.remove file
+                                    else
+                                        ()
+                                  | _ => ())) fs;
                        !postHandler ())
 
 fun shell ss = OS.Process.isSuccess (OS.Process.system (String.concat ss))
@@ -176,4 +187,41 @@ fun writeList (fname, ls) =
        TextIO.closeOut outf
     end
 
+fun lineInFile fname line =
+    let
+       val inf = TextIO.openIn fname
+       val line' = line ^ "\n"
+
+       fun loop () =
+           case TextIO.inputLine inf of
+               NONE => false
+             | SOME line => line = line' orelse loop ()
+    in
+       loop ()
+       before TextIO.closeIn inf
+    end handle IO.Io _ => false
+
+fun inGroup {user, group} =
+    List.exists (fn x => x = user)
+               (Posix.SysDB.Group.members (Posix.SysDB.getgrnam group))
+               handle OS.SysErr _ => false
+
+fun mkDirAll dir = ignore (OS.Process.system ("mkdir -p " ^ dir))
+
+fun remove (ls, x) = List.filter (fn y => y <> x) ls
+fun removeDups ls = List.foldr (fn (x, ls) =>
+                                  if List.exists (fn y => y = x) ls then
+                                      ls
+                                  else
+                                      x :: ls) [] ls
+
+fun moveDirCreate {from, to} =
+    (mkDirAll to;
+     if Posix.FileSys.access (from, []) then
+        (ignore (OS.Process.system ("rm -rf " ^ to));
+         ignore (OS.Process.system ("cp -r " ^ from ^ " " ^ to));
+         ignore (OS.Process.system ("rm -rf " ^ from)))
+     else
+        ())
+
 end