Reorganise modules

lakefile.lean

@@ -8,6 +8,8 @@ package sand where
  srcDir := "src"
 
 lean_lib Sand
+lean_lib Daemon
+lean_lib Client
 
 @[default_target] lean_exe sand where
  root := `Main

src/Sand/SandClient.lean → src/Client.lean

@@ -238,7 +238,7 @@ def runtimeDir : IO FilePath := do
 def getSockPath : IO FilePath :=
  runtimeDir <&> (· / "sand.sock")
 
-def SandClient.main (args : List String) : IO UInt32 := do
+def Client.main (args : List String) : IO UInt32 := do
  let some cmd := parseArgs args | do
  IO.println usage
  IO.Process.exit 1

src/Sand/SandDaemon.lean → src/Daemon.lean

@@ -2,8 +2,8 @@ import «Sand».Basic
 import «Sand».Time
 import «Sand».Message
 import «Sand».Timers
-import «Sand».SandDaemon.Basic
-import «Sand».SandDaemon.HandleCommand
+import «Daemon».Basic
+import «Daemon».HandleCommand
 
 open System (FilePath)
 
@@ -40,7 +40,7 @@ def envFd : IO (Option UInt32) := OptionT.run do
 
 def systemdSockFd : UInt32 := 3
 
-def SandDaemon.main (_args : List String) : IO α := do
+def Daemon.main (_args : List String) : IO α := do
  IO.eprintln s!"Starting Sand daemon {Sand.version}"
 
  let fd ← match ← envFd with

src/Sand/SandDaemon/HandleCommand.lean → src/Daemon/HandleCommand.lean

@@ -1,5 +1,5 @@
 import «Sand».Message
-import «Sand».SandDaemon.Basic
+import «Daemon».Basic
 
 open System (FilePath)
 open Sand

src/Main.lean

@@ -1,4 +1,6 @@
-import Sand
+import «Sand»
+import «Daemon»
+import «Client»
 
 def version : IO UInt32 := do
  println! "Sand {Sand.version}"
@@ -7,5 +9,5 @@ def version : IO UInt32 := do
 def main (args : List String) : IO UInt32 := do
  match args with
  | ("version" :: _) => version
- | ("daemon" :: rest) => SandDaemon.main rest
- | _ => SandClient.main args
+ | ("daemon" :: rest) => Daemon.main rest
+ | _ => Client.main args

src/Sand.lean

@@ -1,2 +0,0 @@
-import «Sand».SandDaemon
-import «Sand».SandClient