Changeset 15 in code for trunk

Timestamp:

Sep 24, 2022, 8:01:37 PM (3 years ago)

Author:

fox

Message:

List peers (from index.pck) in exported htm and gmi index

Location:

trunk

Files:

• cli/convert.ml (modified) (2 diffs)
• cli/gemini.ml (modified) (2 diffs)
• cli/html.ml (modified) (3 diffs)
• install (modified) (1 diff)
• readme (modified) (1 diff)

trunk/cli/convert.ml

@@ -45 +45 @@
                 (match Header_pack.of_string @@ File_store.to_string fname with
                 | Error s -> prerr_endline s
-                | Ok { info; _ } ->
+                | Ok { info; peers; _ } ->
                         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
@@ -51 +51 @@
                                 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
                         let cs = converters types kv in
                         directory cs noindex dir info.Header_pack.id kv)

trunk/cli/gemini.ml

@@ -72 +72 @@
   List.fold_left (fun a x -> a ^ list_item x x) "" (List.rev topic_roots)
 
-let topic_main_index title topic_roots metas =
-        "# " ^ title ^ "\n\n"
+let topic_main_index r title topic_roots metas =
+  "# " ^ title ^ "\n\n"
   ^ (if topic_roots <> [] then ("## Main topics\n\n" ^ fold_topic_roots topic_roots) else "")
   ^ "\n## Latest\n\n" ^ to_dated_links ~limit:10 metas
-  ^ "\n=> index.date.gmi More by date\n"
+  ^ "\n=> index.date.gmi More by date\n\n"
+  ^ let peers = Logarion.Store.KV.find "Peers" r.Conversion.kv in
+    if peers = "" then "" else
+    List.fold_left (fun a s -> Printf.sprintf "%s=> %s\n" a s) "## Peers\n\n"
+      (Str.split (Str.regexp ";\n") peers)
 
 let topic_sub_index title topic_map topic_root metas =
@@ -89 +93 @@
 
         if index_name <> "" then
-                file index_name (topic_main_index title r.topic_roots r.texts);
+                file index_name (topic_main_index r title r.topic_roots r.texts);
 
         file "index.date.gmi" (date_index title r.texts);

trunk/cli/html.ml

@@ -37 +37 @@
 let topic_link root topic = 
   let replaced_space = String.map (function ' '->'+' | x->x) in
-  "<a href='index." ^ replaced_space root ^ ".htm#" ^ replaced_space topic ^ "'>"
+  "<a href='index." ^ root ^ ".htm#" ^ replaced_space topic ^ "'>"
   ^ String.capitalize_ascii topic ^ "</a>"
 
@@ -148 +148 @@
     (fold_topic_roots topic_roots
      ^ "<nav><h1>Latest</h1><ul>" ^ to_dated_links ~limit:8 metas
-     ^ {|</ul><a href="index.date.htm">More by date</a></nav>|} )
+     ^ {|</ul><a href="index.date.htm">More by date</a>|}
+     ^ let peers = Logarion.Store.KV.find "Peers" conv.kv in
+       (if peers = "" then "" else
+        List.fold_left (fun a s -> Printf.sprintf {|%s<li><a href="%s">%s</a>|} a s s) "<h1>Peers</h1><ul>"
+        (Str.split (Str.regexp ";\n") (Logarion.Store.KV.find "Peers" conv.kv))
+        ^ "</ul>"))
 
 let topic_sub_index conv htm topic_map topic_root metas =
@@ -172 +177 @@
 
         let base_url = try
-                let _i = Str.(search_forward (regexp "https?://[^;]*") (Store.KV.find "Locations" c.kv) 0) in
-                Str.(matched_string (Store.KV.find "Locations" c.kv))
+                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)

trunk/install

@@ -3 +3 @@
 Requirements are ocaml (the compiler) and opam (the package manager). Then run:
 
-        opam pin add text_parse git://orbitalfox.eu/text-parse-ml
-        opam pin add logarion git://orbitalfox.eu/logarion
+        opam pin add text_parse https://git.disroot.org/orbifx/text-parse-ml.git
+        opam pin add logarion https://git.disroot.org/orbifx/logarion.git
         opam install logarion

trunk/readme

@@ -6 +6 @@
 
 Source: <http://git.disroot.org/orbifx/logarion>
-EUPL licence: <http://joinup.ec.europa.eu/software/page/eupl>
+Licence: EUPL <http://joinup.ec.europa.eu/software/page/eupl>
 
 IRC: <irc://tilde.chat/#logarion>