Changeset 21 in code for trunk/cli

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

Location:

trunk/cli

Files:

• convert.ml (modified) (2 diffs)
• html.ml (modified) (1 diff)
• publish.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

trunk/cli/html.ml

@@ -28 +28 @@
         let header = match htm.templates.header with 
                 | Some x -> replace x
-                | None -> Printf.(sprintf "<header><a href='.'>%s</a></header>%s" site_title
+                | None -> Printf.(sprintf "<header><a href='.'>%s</a>%s</header>" site_title
                                 (if feed <> "" then sprintf "<nav><a href='%s' id='feed'>feed</a></nav>" feed else ""))
         in

trunk/cli/publish.ml

@@ -1 +1 @@
 let targets () =
-        let home =
-                try Sys.getenv "txtpubdir" with Not_found ->
-                try Sys.getenv "HOME" with Not_found -> ""
+        let kv = Logarion.File_store.of_kv_file () in
+        let pub_dir =
+                try Logarion.Store.KV.find "Pubdir" kv with Not_found ->
+                try Sys.getenv "txtpubdir" with Not_found -> ""
         in
-        List.filter
-                (fun x -> try Sys.is_directory (snd x) with Sys_error _ -> false)
-                [
-                        "htm", home ^ "/public_html/txt";
-                        "gmi", home ^ "/public_gemini/txt";
-                        "", home ^ "/public_gopher/txt";
-                ]
+        let exists_dir dir = Sys.is_directory (Filename.concat pub_dir dir) in
+        List.filter (fun x -> try exists_dir (snd x) with Sys_error _ -> false) [
+                "htm,atom", "public_html/";
+                "gmi,gmi-atom", "public_gemini/";
+                "", "public_gopher/";
+        ]
 
 open Logarion
@@ -17 +17 @@
         let targets = targets () in
         let pub_dirs = List.map (fun x -> snd x) targets in
-        try File_store.iter ~predicate (fun (_t, p) -> File.file ((List.hd p)::pub_dirs))
-        with Unix.Unix_error (Unix.EEXIST, _, _) -> ();
-        List.iter (fun t ->
+        File_store.iter ~predicate (fun (_t, p) ->
+                try File.file ((List.hd p)::pub_dirs)
+                with Unix.Unix_error (Unix.EEXIST, _, _) -> ());
+        List.iter (fun t -> Printf.eprintf "%s %s\n" (fst t) (snd t);
                 Index.((load (snd t)) false None None None None);
-                Convert.at_path (fst t) false (snd t))
+                Convert.at_path (fst t) false (snd t);
+                prerr_endline (snd t))
                 targets