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

trunk/cli/txt.ml

@@ -1 @@
-open Ocmd
-let default_cmd =
-        let doc = "Discover, collect & exchange texts" in
-        let man = [ `S "CONTACT"; `P "<mailto:logarion-dev@chaotic.ninja>" ] in
-        Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version:"%%VERSION%%" ~doc ~man
+open Cmdliner
 
-let () = match Term.eval_choice default_cmd [
-        Authors.term;
-        Convert.term;
-        Edit.term;
-        File.term; File.unfile_term;
-        Index.term;
-        Last.term;
-        Listing.term;
-        New.term;
-        Peers.term;
-        Pull.term;
-        Read.term;
-        Recent.term;
-        Topics.term;
-        ] with `Error _ -> exit 1 | _ -> exit 0
+let subs = [
+    Authors.cmd; (* Done *)
+    Convert.cmd; (* Done *)
+    Edit.cmd; (* Done *)
+    File.cmd; (* Done *)
+    Index.cmd; (* Done *)
+    Last.cmd; (* Done *)
+    Listing.cmd; (* Done *)
+    New.cmd; (* Done *)
+    Peers.cmd; (* Done *)
+    Pull.cmd; (* Done *)
+    Read.cmd; (* Done *)
+    Recent.cmd; (* Done *)
+    Topics.cmd; (* Done *)
+    Unfile.cmd; (* Done *)
+  ]
+
+let default_cmd = Term.(ret (const (`Help (`Pager, None))))
+
+let txt =
+  let doc = "Discover, collect and exchange texts" in
+  let man = [
+      `S "CONTACT";
+      `P "<mailto:logarion-dev@chaotic.ninja>"; ]
+  in
+  Cmd.group (Cmd.info "txt" ~version:"%%VERSION%%" ~doc ~man) ~default:default_cmd subs
+
+let main () = exit (Cmd.eval txt)
+let () = main ()