From cc7515bfac9acc171789a66071fa412dbeea282b Mon Sep 17 00:00:00 2001
From: orbifx <fox@orbitalfox.eu>
Date: Sun, 6 Nov 2022 11:44:56 +0000
Subject: [PATCH] Directory parameter for listing, defaults to txtdir

---
 cli/listing.ml | 18 +++++++++++-------
 cli/recent.ml  |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cli/listing.ml b/cli/listing.ml
index 3c81bfc..19b232c 100644
--- a/cli/listing.ml
+++ b/cli/listing.ml
@@ -2,7 +2,8 @@ open Logarion
 module FS = File_store
 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
 	let list_text (t, fnames) = Printf.printf "%s %s %s 𐄁 %s%s\n"
@@ -11,12 +12,12 @@ let listing r order_opt reverse_opt number_opt paths_opt authors_opt topics_opt
 		t.Text.title (if paths_opt then (List.fold_left (Printf.sprintf "%s\n@ %s") "" fnames) else "")
 	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
 let term =
@@ -30,7 +31,10 @@ let term =
 		~docv:"comma-separated names" ~doc:"texts by authors") in
 	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." ]
diff --git a/cli/recent.ml b/cli/recent.ml
index 4522c6a..a59767d 100644
--- a/cli/recent.ml
+++ b/cli/recent.ml
@@ -13,7 +13,9 @@ let term =
 		~docv:"comma-separated names" ~doc:"texts by authors") in
 	let topics = Arg.(value & opt (some string) None & info ["topics"]
 		~docv:"comma-separated topics" ~doc:"texts with topics") in
-	Term.(const Listing.listing $ recurse $ (const true) $ reverse $ number $ paths $ authed $ topics),
+	let dir  = Arg.(value & pos 0 string "" & info []
+		~docv:"directory to index") in
+	Term.(const Listing.listing $ recurse $ (const true) $ reverse $ number $ paths $ authed $ topics $ dir),
 	Term.info "recent" ~doc:"list recent texts" ~man:[ `S "DESCRIPTION";
 		`P "List header information of most recent texts. If -R is used, list header
 		information for texts found in subdirectories too, along with their filepaths" ]