Changeset 21 in code for trunk/cli/convert.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/cli/convert.ml (modified) (2 diffs)

trunk/cli/convert.ml

@@ -40 +40 @@
 
 let load_kv dir =
-        let conf = Filename.concat dir ".convert.conf" in (* TODO: better name? *)
-        let kv = if Sys.file_exists conf then File_store.of_kv_file conf else Store.KV.empty in
+        let kv = File_store.of_kv_file () in
         let idx = Filename.concat dir "index.pck" in
         if not (Sys.file_exists idx) then kv else
@@ -49 +48 @@
                         let kv = if Store.KV.mem "Id" kv then kv else Store.KV.add "Id" info.Header_pack.id kv in
                         let kv = if Store.KV.mem "Title" kv then kv else Store.KV.add "Title" info.Header_pack.title kv in
-                        let kv = Store.KV.add "Locations" (String.concat ";\n" info.Header_pack.locations) kv in
+                        let kv = if Store.KV.mem "Locations" kv then kv else Store.KV.add "Locations" (String.concat ";\n" info.Header_pack.locations) kv in
                         let kv = Store.KV.add "Peers" (String.concat ";\n" Header_pack.(to_str_list peers)) kv in
                         kv