···
(* Remove any existing file for this key *)
(match find_file t.base_dir key with
| Some (old_path, _, _) ->
+
(* Also remove the sidecar .key file if it exists *)
+
(* Get the parent directory and filename from the path *)
+
let dirs = key_to_dirs key in
+
let dir_path = List.fold_left (fun acc d -> Path.(acc / d)) t.base_dir dirs in
+
(* We need to find the actual filename to append .key to it *)
+
(match find_file t.base_dir key with
+
(* The file was found, so let's find its name and remove the .key file *)
+
let entries = Path.read_dir dir_path in
+
let hash = hash_key key in
+
let hash_rest = String.sub hash 4 (String.length hash - 4) in
+
List.iter (fun entry ->
+
if String.starts_with ~prefix:(hash_rest ^ ":2") entry then
+
let key_file_path = Path.(dir_path / (entry ^ ".key")) in
+
(try Path.unlink key_file_path with _ -> ())
with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
···
(* Create final filename and move *)
let final_name = key_to_filename ?ttl:ttl_abs ~flags key in
let final_path = Path.(dir / final_name) in
+
Path.rename temp_path final_path;
+
(* Write the sidecar .key file containing the original key *)
+
let key_file_path = Path.(dir / (final_name ^ ".key")) in
+
Switch.run @@ fun sw ->
+
let key_sink = Path.open_out ~sw ~create:(`Or_truncate 0o644) key_file_path in
+
Flow.copy (Flow.string_source key) key_sink;
(** {1 Basic Operations} *)
···
Mutex.use_rw ~protect:false t.mutex @@ fun () ->
match find_file t.base_dir key with
+
(* Also remove the sidecar .key file if it exists *)
+
(* Since we have the full path, we need to extract the directory and filename *)
+
let dirs = key_to_dirs key in
+
let dir_path = List.fold_left (fun acc d -> Path.(acc / d)) t.base_dir dirs in
+
let entries = Path.read_dir dir_path in
+
let hash = hash_key key in
+
let hash_rest = String.sub hash 4 (String.length hash - 4) in
+
List.iter (fun entry ->
+
if String.starts_with ~prefix:(hash_rest ^ ":2") entry then
+
let key_file_path = Path.(dir_path / (entry ^ ".key")) in
+
(try Path.unlink key_file_path with _ -> ())
with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
···
let dir2_path = Path.(dir1_path / dir2) in
List.fold_left (fun acc filename ->
+
(* Skip .key files themselves *)
+
if String.ends_with ~suffix:".key" filename then
+
match parse_filename filename with
+
| Some (hash_rest, ttl, flags) ->
+
let path = Path.(dir2_path / filename) in
+
let stat = Path.stat ~follow:false path in
+
(* Try to read the original key from the sidecar file *)
+
let key_path = Path.(dir2_path / (filename ^ ".key")) in
+
Switch.run @@ fun sw ->
+
let source = Path.open_in ~sw key_path in
+
let buf_read = Eio.Buf_read.of_flow ~max_size:4096 source in
+
let content = Eio.Buf_read.take_all buf_read in
+
(* Fall back to using the hash if sidecar file doesn't exist *)
+
dir1 ^ dir2 ^ hash_rest
+
let entry = Entry.create
+
~size:(Optint.Int63.to_int64 stat.size)
) acc (Path.read_dir dir2_path)
) acc (Path.read_dir dir1_path)
···
(* Move to final location *)
let final_path = Path.(dir / filename) in
+
Path.rename temp_path final_path;
+
(* Write the sidecar .key file for chunks too *)
+
let key_file_path = Path.(dir / (filename ^ ".key")) in
+
Switch.run @@ fun sw ->
+
let key_sink = Path.open_out ~sw ~create:(`Or_truncate 0o644) key_file_path in
+
Flow.copy (Flow.string_source key) key_sink;
let get_range t ~key ~range ~sw =
(* First check for complete file *)
···
let cleanup_chunks t ~key =
let chunks = list_chunks t ~key in
+
let path = Chunk.path chunk in
+
(* Also remove the sidecar .key file if it exists *)
+
(* We need to derive the key file path from the chunk path *)
+
(* Since chunk.path is the full path to the chunk file, we can't decompose it easily *)
+
(* Instead, let's find and remove any matching .key files in the directory *)
+
let dirs = key_to_dirs (Chunk.key chunk) in
+
let dir_path = List.fold_left (fun acc d -> Path.(acc / d)) t.base_dir dirs in
+
let entries = Path.read_dir dir_path in
+
List.iter (fun entry ->
+
if String.ends_with ~suffix:".key" entry && String.starts_with ~prefix:(Chunk.hash chunk |> fun h -> String.sub h 4 (String.length h - 4)) entry then
+
(try Path.unlink Path.(dir_path / entry) with _ -> ())
anil.recoil.org