X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/e0b0abd209a1ecbd9266cfcf8735af171f96869b..1638d5a206cd79e9619f0d3334fed29eaddc6b51:/src/slave.sml

diff --git a/src/slave.sml b/src/slave.sml
index 4e44a8b..01d872c 100644
--- a/src/slave.sml
+++ b/src/slave.sml
@@ -22,14 +22,17 @@ 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,
 		    file : string}
-		   
+
 val fileHandler = ref (fn _ : file_status => ())
 val preHandler = ref (fn () => ())
 val postHandler = ref (fn () => ())
@@ -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))
@@ -71,6 +82,15 @@ fun shellF (ss, msg) =
 	    ErrorMsg.error NONE (msg s)
     end
 
+fun hostname () =
+    let
+	val inf = TextIO.openIn "/etc/hostname"
+    in
+	case TextIO.inputLine inf of
+	    NONE => (TextIO.closeIn inf; raise Fail "No line in /etc/hostname")
+	  | SOME line => (TextIO.closeIn inf; String.substring (line, 0, size line - 1))
+    end
+
 fun concatTo p fname =
     let
 	fun visitDir dname =
@@ -98,7 +118,7 @@ fun concatTo p fname =
 	    end
     in
 	TextIO.closeOut (TextIO.openOut fname);
-	visitDir Config.resultRoot
+	visitDir (OS.Path.joinDirFile {dir = Config.resultRoot, file = hostname ()})
     end
 
 fun enumerateTo p sep fname =
@@ -141,8 +161,67 @@ fun enumerateTo p sep fname =
 		loop ()
 	    end
     in
-	visitDir Config.resultRoot;
+	visitDir (OS.Path.joinDirFile {dir = Config.resultRoot, file = hostname ()});
 	TextIO.closeOut outf
     end
 
+fun readList fname =
+    let
+	val inf = TextIO.openIn fname
+
+	fun loop acc =
+	    case TextIO.inputLine inf of
+		NONE => rev acc
+	      | SOME line => loop (String.substring (line, 0, size line - 1) :: acc)
+    in
+	loop []
+	before TextIO.closeIn inf
+    end
+
+fun writeList (fname, ls) =
+    let
+	val outf = TextIO.openOut fname
+    in
+	app (fn s => (TextIO.output (outf, s);
+		      TextIO.output1 (outf, #"\n"))) 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