Changeset 61 in code for trunk/cli

Timestamp:

Apr 1, 2024, 2:01:11 PM (13 months ago)

Author:

yakumo.izuru

Message:

Fix RSS/Atom generation for Gemini and HTTP, remove the txt publish feature

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

Location:

trunk/cli

Files:

• atom.ml (modified) (3 diffs)
• dune (modified) (1 diff)
• publish.ml (deleted)
• txt.ml (modified) (2 diffs)

trunk/cli/atom.ml

@@ -12 +12 @@
 module P = Parsers.Plain_text.Make (Converter.Html)
 
-let id txt = "<id>urn:uuid:" ^ Logarion.(txt.Text.id) ^ "</id>"
+let id txt = "<id>urn:txtid:" ^ Logarion.(txt.Text.id) ^ "</id>"
 let title text = "<title>" ^ esc text.Logarion.Text.title ^ "</title>"
 
@@ -30 +30 @@
   let open Logarion in
   let u = Text.short_id text in
-  "<entry><link rel=\"alternate\" href=\"" ^ base_url ^ "/" ^ u ^ ".htm\" />"
+  "<entry>\n<link rel=\"alternate\" href=\"" ^ base_url ^ "/" ^ u ^ ".htm\" />"
   ^ title text ^ id text ^ updated text ^ authors text
   ^ (opt_element "summary" @@ esc @@ Text.str "abstract" text)
-  ^ String_set.fold (fun elt a -> a ^ "<category term=\"" ^ esc elt ^ "\"/>") (Text.set "topics" text) ""
-  ^ "<content type=\"xhtml\"><div xmlns=\"http://www.w3.org/1999/xhtml\">"
-  ^ P.of_string text.body ""
-  ^ "</div></content></entry>\n"
+  ^ String_set.fold (fun elt a -> a ^ "<category term=\"" ^ esc elt ^ "\"/>\n") (Text.set "topics" text) ""
+  ^ "</entry>\n"
 
 let gmi_entry base_url text =
   let open Logarion in
   let u = Text.short_id text in
-  "<entry><link rel=\"alternate\" href=\"" ^ base_url ^ "/" ^ u ^ ".gmi\" />"
+  "<entry>\n<link rel=\"alternate\" href=\"" ^ base_url ^ "/" ^ u ^ ".gmi\" />\n"
   ^ title text ^ id text ^ updated text ^ authors text
   ^ (opt_element "summary" @@ esc @@ Text.str "abstract" text)
-  ^ String_set.fold (fun elt a -> a ^ "<category term=\"" ^ elt ^ "\"/>") (Text.set "topics" text) ""
+  ^ String_set.fold (fun elt a -> a ^ "<category term=\"" ^ elt ^ "\"/>\n") (Text.set "topics" text) ""
   ^ "</entry>\n"
 
@@ -66 +64 @@
           ^ 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>"
+          ^ self ^ {|" /><id>urn:txtid:|} ^ c.Conversion.id ^ "</id><updated>"
           ^ Logarion.Date.now () ^ "</updated>\n"
           ^ List.fold_left (fun acc t -> acc ^ entry base_url t) "" c.texts

trunk/cli/dune

@@ -3 +3 @@
  (public_name txt)
  (modules txt authors convert conversion edit file index last listing
-  new topics html atom gemini peers publish pull read recent)
+  new topics html atom gemini peers pull read recent)
  (libraries text_parse.converter text_parse.parsers logarion msgpck curl str cmdliner))

trunk/cli/txt.ml

@@ -1 @@
-let version = "1.3.1"
+let version = "1.3.2"
 
 open Cmdliner
 let default_cmd =
         let doc = "Discover, collect & exchange texts" in
-        let man = [ `S "CONTACT"; `P "<mailto:logarion@lists.tildeverse.org?subject=Logarion>" ] in
+        let man = [ `S "CONTACT"; `P "<mailto:logarion-dev@chaotic.ninja>" ] in
         Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version ~doc ~man
 
@@ -17 +17 @@
         New.term;
         Peers.term;
-        Publish.term;
         Pull.term;
         Read.term;