Changeset 23 in code for trunk/cli/listing.ml

Timestamp:

Nov 6, 2022, 11:44:56 AM (2 years ago)

Author:

fox

Message:

Directory parameter for listing, defaults to txtdir

File:

• trunk/cli/listing.ml (modified) (3 diffs)

trunk/cli/listing.ml

@@ -3 +3 @@
 module A = Archive
 
-let listing r order_opt reverse_opt number_opt paths_opt authors_opt topics_opt =
+let listing r order_opt reverse_opt number_opt paths_opt authors_opt topics_opt dir =
+        let dir = if dir = "" then FS.txtdir () else dir in
         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
@@ -12 +13 @@
         in
         match order_opt with
-        | false -> FS.iter ~r ~predicate list_text
+        | false -> FS.iter ~r ~dir ~predicate list_text
         | true ->
                 let order = match reverse_opt with true -> FS.newest | false -> FS.oldest in
                 match number_opt with
-                | Some number -> FS.iter ~r ~predicate ~order ~number list_text
-                | None -> FS.iter ~r ~predicate ~order list_text
+                | Some number -> FS.iter ~r ~dir ~predicate ~order ~number list_text
+                | None -> FS.iter ~r ~dir ~predicate ~order list_text
 
 open Cmdliner
@@ -31 +32 @@
         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 $ paths $ authed $ topics),
+        let dir  = Arg.(value & pos 0 string "" & info []
+                ~docv:"directory to index") in
+        Term.(const listing $ recurse $ time $ reverse $ number $ paths $ authed $ topics $ dir),
         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 "Diplays text id, date, author, title for a directory.
+                If directory argument is ommitted, $txtdir is used, where empty value defaults to ~/.local/share/texts.
+                If -R is used, list header information for texts found in subdirectories too." ]