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

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