Changeset 66 in code for trunk/cli/recent.ml

Timestamp:

Aug 21, 2024, 1:37:05 AM (8 months ago)

Author:

yakumo.izuru

Message:

Migrate the codebase to the latest revision of Cmdliner

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

File:

• trunk/cli/recent.ml (modified) (1 diff)

trunk/cli/recent.ml

@@ -3 +3 @@
 module A = Archive
 
-open Ocmd
-let term =
-        let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in
-        let reverse = Arg.(value & flag & info ["r"] ~doc:"reverse order") in
-        let paths = Arg.(value & flag & info ["p"] ~doc:"show file paths") in
-        let number = Arg.(value & opt (some int) (Some 10) & info ["n"]
-                ~docv:"number" ~doc:"number of entries to list") in
-        let authed = Arg.(value & opt (some string) None & info ["authored"]
-                ~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
-        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" ]
+open Cmdliner
+let recurse = Arg.(value & flag & info ["R"] ~doc: "Recurse into subdirectories")
+let reverse = Arg.(value & flag & info ["r"] ~doc: "Reverse order")
+let paths = Arg.(value & flag & info ["p"] ~doc: "Show file paths")
+let number = Arg.(value & opt (some int) (Some 10) & info ["n"] ~docv: "number" ~doc: "Number of entries to list")
+let authed = Arg.(value & opt (some string) None & info ["authored"] ~docv: "Comma-separated names" ~doc: "Texts by authors")
+let topics = Arg.(value & opt (some string) None & info ["topics"] ~docv: "Comma-separated topics" ~doc: "Texts with topics")
+let dir = Arg.(value & pos 0 string "" & info [] ~docv: "Directory to index")
+
+let recent_t = Term.(const Listing.listing $ recurse $ (const true) $ reverse $ number $ paths $ authed $ topics $ dir)
+let cmd =
+  let doc = "List recent texts" in
+  let man = [
+      `S Manpage.s_description;
+      `P "List header information of most recent texts.";
+      `P "If -R is used, list header information for texts found in subdirectories, too, along with their filepaths" ]
+  in
+  let info = Cmd.info "recent" ~version:"%%VERSION%%" ~doc ~man in
+  Cmd.v info recent_t