Changeset 17 in code for trunk

Timestamp:

Oct 21, 2022, 7:53:46 PM (3 years ago)

Author:

fox

Message:

New subcommand 'recent'. Tidy last.ml

Location:

trunk/cli

Files:

• dune (modified) (1 diff)
• last.ml (modified) (1 diff)
• recent.ml (added)
• txt.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 read)
+ (modules txt authors convert conversion 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/last.ml

@@ -1 +1 @@
 open Logarion
+
+let last a ((t,_) as pair) = match a with
+        | None -> Some pair
+        | Some (t', _) as pair' ->
+                if Text.newest t t' > 0 then Some pair else pair'
+
+let last_mine a ((t, _) as pair) =
+        let name = Person.Set.of_string (Sys.getenv "USER") in
+        let open Text in
+        match a with
+        | None -> if Person.Set.subset name t.authors then Some pair else None
+        | Some (t', _) as pair' ->
+                if Text.newest t t' > 0 && Person.Set.subset name t'.authors
+                then Some pair else pair'
+
 let last search_mine =
-        let last a ((t,_) as pair) = match a with None -> Some pair
-                | Some (t', _) as pair' -> if Text.newest t t' > 0
-                        then Some pair else pair' in
-        let last_mine a ((t,_) as pair) =
-                let name = Person.Set.of_string (Sys.getenv "USER") in
-                let open Text in
-                match a with
-                | None -> if Person.Set.subset name t.authors then Some pair else None
-                | Some (t', _) as pair' ->
-                        if Text.newest t t' > 0 && Person.Set.subset name t'.authors
-                        then Some pair else pair'
-        in
-        match File_store.fold (if search_mine then last_mine else last) None with
-        | Some (_,f) -> List.iter print_endline f | None -> ()
+        let filter = if search_mine then last_mine else last in
+        match File_store.fold filter None with
+        | None -> ()
+        | Some (_, f) -> List.iter print_endline f
 
 open Cmdliner
 let term =
-        let mine = Arg.(value & flag & info ["mine"]
-                ~doc:"last text authored by me") in
+        let mine = Arg.(value & flag & info ["mine"] ~doc:"last text authored by me") in
         Term.(const last $ mine),
         Term.info "last" ~doc:"most recent text"

trunk/cli/txt.ml

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