Changeset 21 in code for trunk/lib/file_store.ml

Timestamp:

Nov 1, 2022, 5:11:09 PM (2 years ago)

Author:

fox

Message:

Moved conversion file, conf -> pack, fixes

Conversion:

• Configuration sought in: txt.conf, ~/.config/txt/txt.conf
• logarion.conf to produce index and target formats

Publication:

• publish <ids>: copies txt with ID into Pubdir/public_{html,gemini,gopher} (Pubdir fromtxt.conf), if dirs exist, and runs convert <pubdir>

Fixes:

• Feed <nav> regression

File:

• trunk/lib/file_store.ml (modified) (6 diffs)

trunk/lib/file_store.ml

@@ -4 +4 @@
 
 let extension = ".txt"
-let def_dir () = try Sys.getenv "txtdir" with Not_found ->
+
+let txtdir () = try Sys.getenv "txtdir" with Not_found ->
         let share = Filename.concat (Sys.getenv "HOME") ".local/share/texts/" in
         match Sys.is_directory share with true -> share
         | false | exception (Sys_error _) -> "."
+
+let cfgpath () = match "txt.conf" with
+        | filepath when Sys.file_exists filepath -> filepath
+        | _ -> match Filename.concat (Sys.getenv "HOME") ".config/txt/txt.conf" with
+                | filepath when Sys.file_exists filepath -> filepath
+                | _ -> ""
 
 let to_string f =
@@ -81 +88 @@
         @@ List.fold_left (fold_valid_text predicate) new_iteration flist
 
-let iter ?(r=false) ?(dir=def_dir ()) ?(predicate=fun _ -> true) ?order ?number fn =
+let iter ?(r=false) ?(dir=txtdir ()) ?(predicate=fun _ -> true) ?order ?number fn =
         let flist = list_fs ~r dir in match order with
         | Some comp -> List.iter fn @@ fold_sort_take ~predicate ~number comp flist
@@ -87 +94 @@
                 List.fold_left (fold_valid_text predicate) new_iteration flist
 
-let fold ?(r=false) ?(dir=def_dir ()) ?(predicate=fun _ -> true) ?order ?number fn acc =
+let fold ?(r=false) ?(dir=txtdir ()) ?(predicate=fun _ -> true) ?order ?number fn acc =
         let flist = list_fs ~r dir in match order with
         | Some comp -> List.fold_left fn acc @@ fold_sort_take ~predicate ~number comp flist
@@ -122 +129 @@
         if Sys.file_exists candidate then Error "Name clash, try again" else Ok candidate
 
-let with_text ?(dir=def_dir ()) new_text =
+let with_text ?(dir=txtdir ()) new_text =
         match id_filename dir extension new_text with
         | Error _ as e -> e
@@ -134 +141 @@
 end
 
-let of_kv_file path =
+let of_kv_file ?(path=cfgpath ()) () =
         let open Text_parse in
         let subsyntaxes = Parsers.Key_value.[|
@@ -140 +147 @@
         let of_string text acc =
                 Parser.parse subsyntaxes { text; pos = 0; right_boundary = String.length text - 1 } acc in
-        of_string (to_string @@ path) Store.KV.empty
+        if path <> "" then of_string (to_string @@ path) Store.KV.empty
+        else Store.KV.empty