Changeset 3 in code for trunk/cli/atom.ml

Timestamp:

Apr 15, 2022, 1:17:01 PM (3 years ago)

Author:

fox

Message:

• Removed 'txt init'

Format

• New B32 ID

Index

• New option: txt index --print
• Move scheme to peers
• Replace peer.*.conf files with index packed locations Instead of adding a URL to peers.*.conf, run txt pull <url>

Conversion

• Rewritten converters
• txt-convert looks for a .convert.conf containing key: value lines.
• Specifiable topic-roots from .convert.conf.
• Added Topics: key, with comma seperated topics.

If set only those topics will appear in the main index and used as topic roots.
Other topics will have sub-indices generated, but won't be listed in the main index.

• HTML converter header & footer options
• HTML-index renamed to HTM-index

Internal

• Change types: uuid:Uuid -> id:string
• File_store merges identical texts
• Use peer ID for store path, store peers' texts in .local/share/texts
• Simple URN resolution for converter

Continue to next feed if parsing one fails

• Phasing-out Archive, replaced by improved packs
• Eliminate Bos, Cohttp, lwt, uri, tls, Re, Ptime, dependencies
• Lock version for Cmdliner, fix dune-project
• Optional resursive store
• Improve header_pack
• Fix recursive mkdir

File:

• trunk/cli/atom.ml (modified) (2 diffs)

trunk/cli/atom.ml

@@ -10 +10 @@
 module P = Parsers.Plain_text.Make (Converter.Html)
 
-let id txt = "<id>urn:uuid:" ^ Logarion.(Id.to_string txt.Text.uuid) ^ "</id>"
+let id txt = "<id>urn:uuid:" ^ Logarion.(txt.Text.id) ^ "</id>"
 let title text = "<title>" ^ esc text.Logarion.Text.title ^ "</title>"
 
 let authors text =
-        let u acc addr = acc ^ element "uri" (Uri.to_string addr) in
+        let u acc addr = acc ^ element "uri" addr in
   let open Logarion in
   let fn txt a =
@@ -52 +52 @@
   ^ title ^ {|</title><link rel="alternate" type="|} ^ alternate_type ^ {|" href="|}
   ^ base_url ^ {|/" /><link rel="self" type="application/atom+xml" href="|}
-  ^ self ^ {|" /><id>urn:uuid:|} ^ Logarion.Id.to_string archive_id ^ "</id><updated>"
-  ^ Ptime.to_rfc3339 (Ptime_clock.now ()) ^ "</updated>\n"
+  ^ 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>"