Changeset 19 in code for trunk

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

Location:

trunk/cli

Files:

• atom.ml (modified) (2 diffs)
• conversion.ml (modified) (1 diff)
• convert.ml (modified) (3 diffs)
• gemini.ml (modified) (1 diff)
• html.ml (modified) (4 diffs)

trunk/cli/atom.ml

@@ +1 @@
+let ext = ".atom"
+
 let esc = Converter.Html.esc
 
@@ -45 +47 @@
   ^ "</entry>\n"
 
-let feed title archive_id base_url alternate_type texts =
-        let entry, self = match alternate_type with
-                | "text/gemini" -> gmi_entry, base_url^"/gmi.atom"
-                | "text/html" | _ -> htm_entry, base_url^"/feed.atom" in
-  {|<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" xml:base="|} ^ base_url ^ {|"><title>|}
-  ^ title ^ {|</title><link rel="alternate" type="|} ^ alternate_type ^ {|" href="|}
-  ^ base_url ^ {|/" /><link rel="self" type="application/atom+xml" href="|}
-  ^ self ^ {|" /><id>urn:uuid:|} ^ archive_id ^ "</id><updated>"
-  ^ Logarion.Date.now () ^ "</updated>\n"
-  ^ List.fold_left (fun acc t -> acc ^ entry base_url t) "" texts
-  ^ "</feed>"
+let base_url kv protocol = try
+        let locs = Logarion.Store.KV.find "Locations" kv in
+        let _i = Str.(search_forward (regexp (protocol ^ "://[^;]*")) locs 0) in
+        Str.(matched_string locs)
+        with Not_found -> Printf.eprintf "Missing location for %s" protocol; ""
+
+let indices alternate_type c =
+        let file name = Logarion.File_store.file (Filename.concat c.Conversion.dir name) in
+        let title = try Logarion.Store.KV.find "Title" c.Conversion.kv with Not_found -> "" in
+        let entry, fname, protocol_regexp = match alternate_type with
+        | "text/gemini" -> gmi_entry, "gmi.atom", "gemini"
+        | "text/html" | _ -> htm_entry, "feed.atom", "https?"
+        in
+        let base_url = base_url c.kv protocol_regexp in
+        let self = Filename.concat base_url fname in
+        file fname @@
+          {|<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" xml:base="|} ^ base_url ^ {|"><title>|}
+          ^ title ^ {|</title><link rel="alternate" type="|} ^ alternate_type ^ {|" href="|}
+          ^ base_url ^ {|/" /><link rel="self" type="application/atom+xml" href="|}
+          ^ self ^ {|" /><id>urn:uuid:|} ^ c.Conversion.id ^ "</id><updated>"
+          ^ Logarion.Date.now () ^ "</updated>\n"
+          ^ List.fold_left (fun acc t -> acc ^ entry base_url t) "" c.texts
+          ^ "</feed>"
+
+let converter format = Conversion.{ ext; page = None; indices = Some (indices format) }

trunk/cli/conversion.ml

@@ -10 +10 @@
 type fn_t = {
         ext: string;
-        page: t -> Logarion.Text.t -> string;
-        indices: t -> unit;
+        page: (t -> Logarion.Text.t -> string) option;
+        indices: (t -> unit) option;
 }

trunk/cli/convert.ml

@@ -10 +10 @@
                 List.fold_left
                         (fun a f ->
-                                let dest = dest ^ f.Conversion.ext in
-                                if is_older source dest then (File_store.file dest (f.Conversion.page r text); true) else false
-                                || a)
+                                match f.Conversion.page with None -> false || a
+                                | Some page ->
+                                        let dest = dest ^ f.Conversion.ext in
+                                        (if is_older source dest then (File_store.file dest (page r text); true) else false)
+                                        || a)
                         false cs
         | x -> Printf.eprintf "Can't convert Content-Type: %s file: %s" x text.Text.title; false
 
 let converters types kv =
+        let n = String.split_on_char ',' types in
         let t = [] in
-        let t = if ("htm" = types || "all" = types) then
-                (let htm = Html.init kv in
-                 Conversion.{ ext = Html.ext; page = Html.page htm; indices = Html.indices htm })::t
-                else t in
-        let t = if ("gmi" = types || "all" = types) then
-                Conversion.{ ext = Gemini.ext; page = Gemini.page; indices = Gemini.indices}::t else t in
+        let t = if List.(mem "all" n || mem "htm" n) then (Html.converter kv)::t else t in
+        let t = if List.(mem "all" n || mem "atom" n) then (Atom.converter "text/html")::t else t in
+        let t = if List.(mem "all" n || mem "gmi" n) then (Gemini.converter)::t else t in
+        let t = if List.(mem "all" n || mem "gmi-atom" n) then (Atom.converter "text/gemini")::t else t in
         t
 
@@ -36 +37 @@
                 with Not_found -> Topic_set.roots topics in
         let repo = Conversion.{ repo with topic_roots; topics; texts } in
-        if not noindex then List.iter (fun c -> c.Conversion.indices repo) converters;
+        if not noindex then List.iter (fun c -> match c.Conversion.indices with None -> () | Some f -> f repo) converters;
         Printf.printf "Converted: %d Indexed: %d\n" count (List.length texts)
 
@@ -48 +49 @@
                         let kv = let f = Filename.concat dir ".convert.conf" in (* TODO: better place to store convert conf? *)
                                 if Sys.file_exists f then File_store.of_kv_file f else Store.KV.empty in
-                        let kv = if Store.KV.mem "Title" kv then kv
-                                else Store.KV.add "Title" info.Header_pack.title 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 = Store.KV.add "Peers" (String.concat ";\n" Header_pack.(to_str_list peers)) kv in

trunk/cli/gemini.ml

@@ -91 +91 @@
         let index_name = try Store.KV.find "Gemini-index" r.kv with Not_found -> "index.gmi" in
         let title = try Store.KV.find "Title" r.Conversion.kv with Not_found -> "" in
-
-        if index_name <> "" then
-                file index_name (topic_main_index r title r.topic_roots r.texts);
-
+        if index_name <> "" then file index_name (topic_main_index r title r.topic_roots r.texts);
         file "index.date.gmi" (date_index title r.texts);
-
         List.iter
                 (fun topic -> file ("index." ^ topic ^ ".gmi")
                  (topic_sub_index title r.topics topic r.texts))
-                r.topic_roots;
+                r.topic_roots
 
-        let base_url = try
-                let _i = Str.(search_forward (regexp "gemini?://[^;]*") (Store.KV.find "Locations" r.kv) 0) in
-                Str.(matched_string (Store.KV.find "Locations" r.kv))
-                with Not_found -> prerr_endline "Missing location for Gemini"; "" in
-        file "gmi.atom" (Atom.feed title r.id base_url "text/gemini" r.texts)
+let converter = Conversion.{ ext; page = Some page; indices = Some indices}

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) }