Changeset 25 in code for trunk

Timestamp:

Nov 13, 2022, 1:15:27 PM (2 years ago)

Author:

fox

Message:

New edit <ID> command and updated readme

Location:

trunk

Files:

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

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 read recent)
+ (modules txt authors convert conversion edit file index last listing new topics html atom gemini publish pull read recent)
  (libraries text_parse.converter text_parse.parsers logarion msgpck curl str cmdliner))

trunk/cli/read.ml

@@ -1 +1 @@
 open Logarion
-module FS = File_store
-module A = Archive
-
-let print r order_opt reverse_opt number_opt authors_opt topics_opt id_opt =
-        let predicates = if id_opt <> "" then [ A.ided id_opt ] else []
-                @ 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 pager = try Sys.getenv "PAGER" with Not_found -> "less" in
-        let print_text acc (_t, fnames) = Printf.sprintf "%s %s" acc (List.hd fnames) in
-        let paths = match order_opt with
-        | false -> FS.fold ~r ~predicate print_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 print_text ""
-                | None -> FS.fold ~r ~predicate ~order print_text ""
-        in if paths = "" then ()
-        else (ignore @@ Sys.command @@ Printf.sprintf "%s %s" pager paths)
-        
 
 open Cmdliner
@@ -33 +13 @@
         let topics = Arg.(value & opt (some string) None & info ["topics"]
                 ~docv:"comma-separated topics" ~doc:"texts with topics") in
-        Term.(const print $ recurse $ time $ reverse $ number $ authed $ topics $ id),
+        Term.(const (Archive.apply_sys_util "PAGER" "less") $ recurse $ time $ reverse $ number $ authed $ topics $ id),
         Term.info "read" ~doc: "read a text" ~man:[ `S "DESCRIPTION";
                 `P "List header information for current directory. If -R is used, list header

trunk/cli/txt.ml

@@ -4 +4 @@
 let default_cmd =
         let doc = "Discover, collect & exchange texts" in
-        let man = [ `S "Contact"; `P "<mailto:fox@orbitalfox.eu?subject=Logarion>" ] in
+        let man = [ `S "Contact"; `P "<mailto:logarion@lists.tildeverse.org?subject=Logarion>" ] in
         Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version ~doc ~man
 
@@ -10 +10 @@
         Authors.term;
         Convert.term;
+        Edit.term;
         File.term; File.unfile_term;
         Index.term;

trunk/lib/archive.ml

@@ -15 +15 @@
   let q = String_set.query query_string in
   fun n -> String_set.(predicate q (Text.set "Topics" n))
+
+let apply_sys_util env def_env r order_opt reverse_opt number_opt authors_opt topics_opt id_opt =
+        let predicates = if id_opt <> "" then [ ided id_opt ] else []
+                @ predicate authored authors_opt
+                @ predicate topics topics_opt in
+        let predicate text = List.fold_left (fun a e -> a && e text) true predicates in
+        let util = try Sys.getenv env with Not_found -> def_env in
+        let print_text acc (_t, fnames) = Printf.sprintf "%s %s" acc (List.hd fnames) in
+        let paths = match order_opt with
+        | false -> File_store.fold ~r ~predicate print_text ""
+        | true ->
+                let order = match reverse_opt with true -> File_store.newest | false -> File_store.oldest in
+                match number_opt with
+                | Some number -> File_store.fold ~r ~predicate ~order ~number print_text ""
+                | None -> File_store.fold ~r ~predicate ~order print_text ""
+        in if paths = "" then ()
+        else (ignore @@ Sys.command @@ Printf.sprintf "%s %s" util paths)