Changeset 3 in code for trunk/lib/archive.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/lib/archive.ml (modified) (1 diff)

trunk/lib/archive.ml

@@ -1 @@
-(*let module S = Set.Make (Text) in*)
-(*let module M = Map.Make (String) in*)
-(*let module I = Map.Make (Id) in*)
-(*let aggr = I.empty, M.empty, M.empty, M.empty in*)
-(*let fn (id, a, t, k) (n,_) =*)
-(* let id = I.add n.Text.uuid n id in*)
-(* let a =*)
-(*   let f e a = M.update (e.Person.name) (function Some v -> Some (S.add n v) | None -> Some (S.singleton n)) a in*)
-(*   Person.Set.fold f n.Text.authors a in*)
-(* let t =*)
-(*   let f e a = M.update e (function Some v -> Some (S.add n v) | None -> Some (S.singleton n)) a in*)
-(*   String_set.fold f (Text.set "Topics" n) t in*)
-(* let k =*)
-(*   let f e a = M.update e (function Some v -> Some (S.add n v) | None -> Some (S.singleton n)) a in*)
-(*   String_set.fold f (Text.set "Keywords" n) k in*)
-(* (id, a, t, k)*)
+let predicate fn opt = Option.(to_list @@ map fn opt)
 
-module Make (Store : Store.T) = struct
-  include Store
-  let predicate fn opt = Option.(to_list @@ map fn opt)
+let authored query_string =
+  let q = Person.Set.of_query @@ String_set.query query_string in
+  fun n -> Person.Set.predicate q n.Text.authors
 
-  let authored query_string =
-    let q = Person.Set.of_query @@ String_set.query query_string in
-    fun n -> Person.Set.predicate q n.Text.authors
+let keyworded query_string =
+  let q = String_set.query query_string in
+  fun n -> String_set.(predicate q (Text.set "Keywords" n))
 
-  let keyworded query_string =
-    let q = String_set.query query_string in
-    fun n -> String_set.(predicate q (Text.set "Keywords" n))
-
-  let topics query_string =
-    let q = String_set.query query_string in
-    fun n -> String_set.(predicate q (Text.set "Topics" n))
-end
+let topics query_string =
+  let q = String_set.query query_string in
+  fun n -> String_set.(predicate q (Text.set "Topics" n))