Changeset 19 in code for trunk/cli/html.ml

Timestamp:

Oct 26, 2022, 7:36:02 PM (2 years ago)

Author:

fox

Message:

Accept comma separated converter names, separate Atom from Html and Gemini converters.

Note: atom must be called separately now because of the separation. Example

txt convert -t htm,atom xyz

File:

• trunk/cli/html.ml (modified) (4 diffs)

trunk/cli/html.ml

@@ -15 +15 @@
         { templates = { header; footer} }
 
-let wrap c htm text_title body =
-        let site_title = try Logarion.Store.KV.find "Title" c.Conversion.kv
+let wrap conv htm text_title body =
+        let site_title = try Logarion.Store.KV.find "Title" conv.Conversion.kv
                 with Not_found -> "" in
         let replace x = let open Str in
@@ -58 +58 @@
         let keywords = str_set "keywords" text in
         let header =
-                let time x = {|<time datetime="|} ^ x ^ {|">|} ^ x ^ "</time>" in
+                let time x = Printf.sprintf {|<time datetime="%s">%s</time>|}
+                        (Date.rfc_string x) (Date.pretty_date x) in
                 let topic_links x =
                         let to_linked t a =
@@ -67 +68 @@
                 ^ opt_kv "Title:" text.title
                 ^ opt_kv "Authors:" authors
-                ^ opt_kv "Date: " (time (Date.(pretty_date @@ listing text.date)))
+                ^ opt_kv "Date: " (time (Date.listing text.date))
                 ^ opt_kv "Series: " (str_set "series" text)
                 ^ opt_kv "Topics: " (topic_links (set "topics" text))
@@ -162 +163 @@
                 ^ listing_index topic_map [topic_root] "" metas)
 
-open Logarion
 let indices htm c =
         let file name = Logarion.File_store.file (Filename.concat c.Conversion.dir name) in
-        let index_name = try Store.KV.find "HTM-index" c.Conversion.kv with Not_found -> "index.html" in
-        let title = try Store.KV.find "Title" c.Conversion.kv with Not_found -> "" in
-
-        if index_name <> "" then
-                file index_name (topic_main_index c htm c.topic_roots c.texts);
-
+        let index_name = try Logarion.Store.KV.find "HTM-index" c.Conversion.kv with Not_found -> "index.html" in
+        if index_name <> "" then file index_name (topic_main_index c htm c.topic_roots c.texts);
         file "index.date.htm" (date_index c htm c.texts);
-
         List.iter
                 (fun root -> file ("index." ^ root ^ ".htm") (topic_sub_index c htm c.topics root c.texts))
-                c.topic_roots;
+                c.topic_roots
 
-        let base_url = try
-                let locs = Store.KV.find "Locations" c.kv in
-                let _i = Str.(search_forward (regexp "https?://[^;]*") locs 0) in
-                Str.(matched_string locs)
-                with Not_found -> prerr_endline "Missing location for HTTP(S)"; "" in
-        file "feed.atom" (Atom.feed title c.id base_url "text/html" c.texts)
+let converter kv = 
+        let htm = init kv in
+        Conversion.{ ext; page = Some (page htm); indices = Some (indices htm) }