Changeset 9 in code for trunk

Timestamp:

Jun 19, 2022, 9:01:11 PM (3 years ago)

Author:

fox

Message:

Txt read & optional path printing for txt list

Location:

trunk

Files:

• cli/dune (modified) (1 diff)
• cli/listing.ml (modified) (2 diffs)
• cli/read.ml (added)
• cli/txt.ml (modified) (1 diff)
• lib/archive.ml (modified) (1 diff)

trunk/cli/dune

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

trunk/cli/listing.ml

@@ -2 +2 @@
 module FS = File_store
 module A = Archive
-let listing r order_opt reverse_opt number_opt authors_opt topics_opt =
-        let predicates = A.predicate A.authored authors_opt
-                @ A.predicate A.topics topics_opt in
+
+let listing r order_opt reverse_opt number_opt paths_opt authors_opt topics_opt =
+        let predicates = A.predicate A.authored authors_opt @ A.predicate A.topics topics_opt in
         let predicate text = List.fold_left (fun a e -> a && e text) true predicates in
-        let list_text a (t, fnames) = a ^ Printf.sprintf "%s %s %s 𐄁 %s [%s]\n"
+        let list_text (t, fnames) = Printf.printf "%s %s %s 𐄁 %s%s\n"
                 (Text.short_id t) Date.(pretty_date @@ listing t.Text.date)
                 (Person.Set.to_string ~names_only:true t.Text.authors)
-                t.Text.title (List.hd fnames)
+                t.Text.title (if paths_opt then (List.fold_left (Printf.sprintf "%s\n@ %s") "" fnames) else "")
         in
-        print_string @@ match order_opt with
-        | false -> FS.fold ~r ~predicate list_text ""
+        match order_opt with
+        | false -> FS.iter ~r ~predicate list_text
         | true ->
                 let order = match reverse_opt with true -> FS.newest | false -> FS.oldest in
                 match number_opt with
-                | Some number -> FS.fold ~r ~predicate ~order ~number list_text ""
-                | None -> FS.fold ~r ~predicate ~order list_text ""
+                | Some number -> FS.iter ~r ~predicate ~order ~number list_text
+                | None -> FS.iter ~r ~predicate ~order list_text
 
 open Cmdliner
 let term =
-        let recurse = Arg.(value & flag & info ["R"]
-                ~doc:"recursive, include texts in subdirectories too") in
-        let reverse = Arg.(value & flag & info ["r"]
-                ~doc:"reverse order") in
-        let time   = Arg.(value & flag & info ["t"]
-                ~doc:"Sort by time, newest first") in
+        let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in
+        let reverse = Arg.(value & flag & info ["r"] ~doc:"reverse order") in
+        let time   = Arg.(value & flag & info ["t"] ~doc:"sort by time, newest first") in
+        let paths = Arg.(value & flag & info ["p"] ~doc:"show file paths") in
         let number = Arg.(value & opt (some int) None & info ["n"]
                 ~docv:"number" ~doc:"number of entries to list") in
@@ -33 +31 @@
         let topics = Arg.(value & opt (some string) None & info ["topics"]
                 ~docv:"comma-separated topics" ~doc:"texts with topics") in
-        Term.(const listing $ recurse $ time $ reverse $ number $ authed $ topics),
+        Term.(const listing $ recurse $ time $ reverse $ number $ paths $ authed $ topics),
         Term.info "list" ~doc:"list texts" ~man:[ `S "DESCRIPTION";
-        `P "List header information for current directory. If -R is used, list header
-        information for texts found in subdirectories too, along with their filepaths" ]
+                `P "List header information for current directory. If -R is used, list header
+                information for texts found in subdirectories too, along with their filepaths" ]

trunk/cli/txt.ml

@@ -17 +17 @@
         Publish.term;
         Pull.term;
+        Read.term;
         Topics.term;
         ] with `Error _ -> exit 1 | _ -> exit 0

trunk/lib/archive.ml

@@ -4 +4 @@
   let q = Person.Set.of_query @@ String_set.query query_string in
   fun n -> Person.Set.predicate q n.Text.authors
+
+let ided query_string =
+        fun n -> n.Text.id = query_string
 
 let keyworded query_string =