diff options
| -rw-r--r-- | lib/input_foreman.ml | 20 | ||||
| -rw-r--r-- | lib/nixtamal.ml | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/input_foreman.ml b/lib/input_foreman.ml index 01b2926..10ae67a 100644 --- a/lib/input_foreman.ml +++ b/lib/input_foreman.ml @@ -174,6 +174,26 @@ let to_lockfile mk = (fun acc (name, input) -> NameMap.add name (mk input) acc) NameMap.empty +let clean_unlisted_from_silo () = + Logs.debug (fun m -> m "Silo: cleaning unlisted …"); + let silo_path = Eio.Path.(Working_directory.(get () / silo_dir)) in + Eio.Path.read_dir silo_path + |> List.iter (fun name -> + if not (Htbl.mem inputs (Name.make name)) then + let path = Eio.Path.(silo_path / name) in + match Eio.Path.kind ~follow: false path with + | `Symbolic_link -> + Eio.Path.unlink path; + Logs.info (fun m -> m "Silo: unlinked %a." Eio.Path.pp path) + | `Directory | `Regular_file | `Socket -> + Eio.Path.rmtree path; + Logs.info (fun m -> m "Silo: removed %a." Eio.Path.pp path) + | _ -> + () + else + () + ) + let cp_darcs_context ~env ~(name : Name.t) ~context = let (let*) = Result.bind in let original_path = diff --git a/lib/nixtamal.ml b/lib/nixtamal.ml index 8cd371b..5aa5580 100644 --- a/lib/nixtamal.ml +++ b/lib/nixtamal.ml @@ -172,6 +172,7 @@ let lock ~env ~domain_count ?(force = false) ?names () : (unit, error) result = in let* () = Error.tag_lockfile @@ Lockfile.write () in Lock_loader.write (); + Input_foreman.clean_unlisted_from_silo (); Ok () let list_stale ~env ~domain_count : (unit, error) result = @@ -200,4 +201,5 @@ let refresh ~env ~domain_count ?names () : (unit, error) result = in let* () = Error.tag_lockfile @@ Lockfile.write () in Lock_loader.write (); + Input_foreman.clean_unlisted_from_silo (); Ok () |