Changeset 19 in code for trunk/cli/gemini.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/gemini.ml (modified) (1 diff)

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}