- 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

git-svn-id: file:///srv/svn/repo/kosuzu/trunk@3 eb64cd80-c68d-6f47-b6a3-0ada418499da

lib/person.ml

@@ -1,17 +1,18 @@
 module Person = struct
   type name_t = string
-  type address_t = Uri.t
+  type address_t = string
   type t = { name: name_t; addresses: address_t list }
   let empty = { name = ""; addresses = [] }
   let compare = Stdlib.compare
-  let to_string p = List.fold_left (fun a e -> a^" <"^Uri.to_string e^">") p.name p.addresses
+  let name_to_string p = p.name
+  let to_string p = List.fold_left (fun a e -> Printf.sprintf "%s <%s>" a e) p.name p.addresses
   let of_string s = match String.trim s with "" -> empty | s ->
-    match Re.Str.(split (regexp " *< *") s) with
+    match Str.(split (regexp " *< *") s) with
     | [] -> empty
     | [n] -> let name = String.trim n in { empty with name }
     | n::adds ->
       let name = String.trim n in
-      let addresses = List.map (fun f -> Uri.of_string @@ String.(sub f 0 (length f -1))) adds in
+      let addresses = List.map (fun f -> String.(sub f 0 (length f -1))) adds in
       { name; addresses }
 end
 
@@ -19,8 +20,8 @@ include Person
 
 module Set = struct
   include Set.Make(Person)
-  let to_string ?(pre="") ?(sep=", ") s =
-    let str = Person.to_string in
+  let to_string ?(names_only=false) ?(pre="") ?(sep=", ") s =
+    let str = if names_only then Person.name_to_string else Person.to_string in
     let j x a = match a, x with "",_ -> str x | _,x when x = Person.empty -> a | _ -> a^sep^str x in
     fold j s pre
   let of_string s = of_list (List.map Person.of_string (String_set.list_of_csv s))