Semantically sort subheadings

[ldk-sample] / src / cli.rs

diff --git a/src/cli.rs b/src/cli.rs
index f50d3f9fa175aca2e18b49b43d9e93386829a80f..d53b74bbd98609279923b3b104639f3d4b8a1f68 100644 (file)
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -19,7 +19,7 @@ use lightning_invoice::payment::PaymentError;
 use lightning_invoice::{utils, Currency, Invoice};
 use std::env;
 use std::io;
-use std::io::{BufRead, Write};
+use std::io::Write;
 use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
 use std::ops::Deref;
 use std::path::Path;
@@ -147,18 +147,24 @@ pub(crate) async fn poll_for_user_input<E: EventHandler>(
        inbound_payments: PaymentInfoStorage, outbound_payments: PaymentInfoStorage,
        ldk_data_dir: String, network: Network,
 ) {
-       println!("LDK startup successful. To view available commands: \"help\".");
+       println!(
+               "LDK startup successful. Enter \"help\" to view available commands. Press Ctrl-D to quit."
+       );
        println!("LDK logs are available at <your-supplied-ldk-data-dir-path>/.ldk/logs");
        println!("Local Node ID is {}.", channel_manager.get_our_node_id());
-       let stdin = io::stdin();
-       let mut line_reader = stdin.lock().lines();
        loop {
                print!("> ");
                io::stdout().flush().unwrap(); // Without flushing, the `>` doesn't print
-               let line = match line_reader.next() {
-                       Some(l) => l.unwrap(),
-                       None => break,
-               };
+               let mut line = String::new();
+               if let Err(e) = io::stdin().read_line(&mut line) {
+                       break println!("ERROR: {e:#}");
+               }
+
+               if line.len() == 0 {
+                       // We hit EOF / Ctrl-D
+                       break;
+               }
+
                let mut words = line.split_whitespace();
                if let Some(word) = words.next() {
                        match word {
@@ -460,6 +466,7 @@ pub(crate) async fn poll_for_user_input<E: EventHandler>(
                                                Err(e) => println!("ERROR: failed to send onion message: {:?}", e),
                                        }
                                }
+                               "quit" | "exit" => break,
                                _ => println!("Unknown command. See `\"help\" for available commands."),
                        }
                }
@@ -467,19 +474,33 @@ pub(crate) async fn poll_for_user_input<E: EventHandler>(
 }
 
 fn help() {
-       println!("openchannel pubkey@host:port <amt_satoshis> [--public]");
-       println!("sendpayment <invoice>");
-       println!("keysend <dest_pubkey> <amt_msats>");
-       println!("getinvoice <amt_msats> <expiry_secs>");
-       println!("connectpeer pubkey@host:port");
-       println!("listchannels");
-       println!("listpayments");
-       println!("closechannel <channel_id> <peer_pubkey>");
-       println!("forceclosechannel <channel_id> <peer_pubkey>");
-       println!("nodeinfo");
-       println!("listpeers");
-       println!("signmessage <message>");
-       println!("sendonionmessage <node_id_1,node_id_2,..,destination_node_id>");
+       let package_version = env!("CARGO_PKG_VERSION");
+       let package_name = env!("CARGO_PKG_NAME");
+       println!("\nVERSION:");
+       println!("  {} v{}", package_name, package_version);
+       println!("\nUSAGE:");
+       println!("  Command [arguments]");
+       println!("\nCOMMANDS:");
+       println!("  help\tShows a list of commands.");
+       println!("  quit\tClose the application.");
+       println!("\n  Channels:");
+       println!("      openchannel pubkey@host:port <amt_satoshis> [--public]");
+       println!("      closechannel <channel_id> <peer_pubkey>");
+       println!("      forceclosechannel <channel_id> <peer_pubkey>");
+       println!("      listchannels");
+       println!("\n  Peers:");
+       println!("      connectpeer pubkey@host:port");
+       println!("      listpeers");
+       println!("\n  Payments:");
+       println!("      sendpayment <invoice>");
+       println!("      keysend <dest_pubkey> <amt_msats>");
+       println!("      listpayments");
+       println!("\n  Invoices:");
+       println!("      getinvoice <amt_msats> <expiry_secs>");
+       println!("\n  Other:");
+       println!("      signmessage <message>");
+       println!("      sendonionmessage <node_id_1,node_id_2,..,destination_node_id>");
+       println!("      nodeinfo");
 }
 
 fn node_info(channel_manager: &Arc<ChannelManager>, peer_manager: &Arc<PeerManager>) {