Changeset 66 in code for trunk/cli/listing.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/listing.ml (modified) (1 diff)

trunk/cli/listing.ml

@@ -20 +20 @@
                 | None -> FS.iter ~r ~dir ~predicate ~order list_text
 
-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 time   = Arg.(value & flag & info ["t"] ~doc:"sort by time, newest first") in
-        let paths = Arg.(value & flag & info ["p"] ~doc:"show file paths") in
-        let number = Arg.(value & opt (some int) None & 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 $ recurse $ time $ reverse $ number $ paths $ authed $ topics $ dir),
-        Term.info "list" ~doc:"list texts" ~man:[ `S "DESCRIPTION";
-                `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." ]
+open Cmdliner
+
+let recurse = Arg.(value & flag & info ["R"] ~doc: "Recurse into subdirectories")
+let reverse = Arg.(value & flag & info ["r"] ~doc: "Reverse order")
+let time = Arg.(value & flag & info ["t"] ~doc: "Sort by time, newest first")
+let paths = Arg.(value & flag & info ["p"] ~doc: "Show file paths")
+let number = Arg.(value & opt (some int) None & 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 by topics")
+let dir = Arg.(value & pos 0 string "" & info [] ~docv: "directory to index")
+
+let listing_t = Term.(const listing $ recurse $ time $ reverse $ number $ paths $ authed $ topics $ dir)
+
+let cmd =
+  let doc = "List texts" in
+  let man = [
+      `S Manpage.s_description;
+      `P "Displays text id, date, author, title for a directory.";
+      `P "If directory argument is omitted, TXTDIR is used, where empty value defaults to ~/.local/share/texts.";
+      `P "If -R is used, list header information for texts found in subdirectories, too." ]
+  in
+  let info = Cmd.info "list" ~version:"%%VERSION%%" ~doc ~man in
+  Cmd.v info listing_t