Changeset 31 in code for trunk/lib/peers.ml

Timestamp:

Nov 18, 2022, 1:41:55 PM (2 years ago)

Author:

fox

Message:

Introduce 'peers' subcommand, refactor in pull

File:

• trunk/lib/peers.ml (modified) (1 diff)

trunk/lib/peers.ml

@@ -1 +1 @@
 let text_dir = Filename.concat (File_store.txtdir ()) "peers"
 
+type t = { path: string; locations: string list }
+
 let fold fn init = match Sys.readdir text_dir with
-        | exception (Sys_error msg) -> prerr_endline msg
+        | exception (Sys_error msg) -> prerr_endline msg; init
         | dirs ->
-                let read_pack path =
-                        let pack_path = Filename.(concat text_dir @@ concat path "index.pck") in
-                        match Sys.file_exists pack_path with false -> () | true ->
-                                match Header_pack.of_string (File_store.to_string pack_path) with
-                                | Error s -> Printf.eprintf "%s %s\n" s pack_path
-                                | Ok p -> ignore @@ List.fold_left fn init Header_pack.(p.info.locations)
+                let read_pack init path =
+                        let fullpath = Filename.concat text_dir path in
+                        if Sys.is_directory fullpath then begin
+                        let pack_path = Filename.concat fullpath "index.pck" in
+                        match Sys.file_exists pack_path with
+                        | false -> Printf.eprintf "Missing index.pck for %s\n" path; init
+                        | true -> match Header_pack.of_string (File_store.to_string pack_path) with
+                                | Error s -> Printf.eprintf "%s %s\n" s pack_path; init
+                                | Ok p -> fn init { path; locations = Header_pack.(p.info.locations) }
+                        end else init
                 in
-                Array.iter read_pack dirs
+                Array.fold_left read_pack init dirs
 
 let scheme url =