Last change
on this file since 77 was 3, checked in by fox, 3 years ago |
Format
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 size:
1.3 KB
|
Line | |
---|
1 | module Person = struct
|
---|
2 | type name_t = string
|
---|
3 | type address_t = string
|
---|
4 | type t = { name: name_t; addresses: address_t list }
|
---|
5 | let empty = { name = ""; addresses = [] }
|
---|
6 | let compare = Stdlib.compare
|
---|
7 | let name_to_string p = p.name
|
---|
8 | let to_string p = List.fold_left (fun a e -> Printf.sprintf "%s <%s>" a e) p.name p.addresses
|
---|
9 | let of_string s = match String.trim s with "" -> empty | s ->
|
---|
10 | match Str.(split (regexp " *< *") s) with
|
---|
11 | | [] -> empty
|
---|
12 | | [n] -> let name = String.trim n in { empty with name }
|
---|
13 | | n::adds ->
|
---|
14 | let name = String.trim n in
|
---|
15 | let addresses = List.map (fun f -> String.(sub f 0 (length f -1))) adds in
|
---|
16 | { name; addresses }
|
---|
17 | end
|
---|
18 |
|
---|
19 | include Person
|
---|
20 |
|
---|
21 | module Set = struct
|
---|
22 | include Set.Make(Person)
|
---|
23 | let to_string ?(names_only=false) ?(pre="") ?(sep=", ") s =
|
---|
24 | let str = if names_only then Person.name_to_string else Person.to_string in
|
---|
25 | let j x a = match a, x with "",_ -> str x | _,x when x = Person.empty -> a | _ -> a^sep^str x in
|
---|
26 | fold j s pre
|
---|
27 | let of_string s = of_list (List.map Person.of_string (String_set.list_of_csv s))
|
---|
28 |
|
---|
29 | let of_stringset s = String_set.fold (fun e a -> union (of_string e) a) s empty
|
---|
30 | let of_query q = of_stringset (fst q), of_stringset (snd q)
|
---|
31 | let predicate (inc, exl) set = not (disjoint inc set) && disjoint exl set
|
---|
32 | end
|
---|
Note:
See
TracBrowser
for help on using the repository browser.