Changeset 22 in code

Timestamp:

Nov 2, 2022, 9:47:20 PM (2 years ago)

Author:

fox

Message:

Use txt.conf to generate index.pck meta; fix double load while indexing

Location:

trunk

Files:

• cli/index.ml (modified) (1 diff)
• cli/publish.ml (modified) (2 diffs)
• lib/header_pack.ml (modified) (1 diff)

trunk/cli/index.ml

@@ -64 +64 @@
 
 let load dir =
+        let kv = File_store.of_kv_file () in
         let index_path = Filename.concat dir "index.pck" in
-        let pck = match Header_pack.of_string @@ File_store.to_string index_path with
-        | Error s -> failwith s | Ok pck -> pck 
-        | exception (Sys_error _) -> Header_pack.{
-                info = { version = version; id = Id.generate (); title = ""; people = []; locations = [] };
-                fields;
-                texts = of_text_list @@ File_store.fold ~dir
-                        (fun a (t,_) -> of_text a t) [];
-                peers = Msgpck.of_list [];
-        } in
-        index { dir; index_path; pck }
+        index { dir; index_path; pck = Header_pack.of_kv kv }
 
 open Cmdliner

trunk/cli/publish.ml

@@ -1 @@
-let targets () =
-        let kv = Logarion.File_store.of_kv_file () in
+let targets kv =
         let pub_dir =
                 try Logarion.Store.KV.find "Pubdir" kv with Not_found ->
@@ -14 +13 @@
 open Logarion
 let publish ids =
+        let kv = Logarion.File_store.of_kv_file () in
         let predicate t = List.mem t.Text.id ids in
-        let targets = targets () in
+        let targets = targets kv in
         let pub_dirs = List.map (fun x -> snd x) targets in
         File_store.iter ~predicate (fun (_t, p) ->

trunk/lib/header_pack.ml

@@ -54 +54 @@
 let of_string s = unpack @@ snd @@ Msgpck.StringBuf.read s
 
+let of_kv kv =
+        let find k kv = try Store.KV.find k kv with Not_found -> "" in
+        let find_ls k kv = try String_set.list_of_csv (Store.KV.find k kv) with Not_found -> [] in
+        {
+                info = { version = version; id = find "Id" kv; title = find "Title" kv;
+                        people = find_ls "Authors" kv; locations = find_ls "Locations" kv };
+                fields;
+                texts = Msgpck.List [];
+                peers = str_list (find_ls "Peers" kv);
+        }
+
 let list filename = try
         let texts_list = function