From cfc0ab78a893d6a16d2eedfef290c9e1496a23e1 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Thu, 15 Oct 2020 22:09:57 +0200 Subject: add basic error messaging on mumd --- mumctl/src/main.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 403447f..9bb96a8 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -1,4 +1,4 @@ -use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; +use ipc_channel::ipc::{self, IpcSender}; use log::*; use mumlib::command::{Command, CommandResponse}; use mumlib::setup_logger; @@ -10,14 +10,13 @@ fn main() { // MUMCTL //temp send command and channel to listener debug!("Creating channel"); - let (tx_client, rx_client): (IpcSender, ()>>, - IpcReceiver, ()>>) = ipc::channel().unwrap(); + let (tx_client, rx_client) = ipc::channel::>>().unwrap(); let server_name = fs::read_to_string("/var/tmp/mumd-oneshot").unwrap(); //TODO don't panic debug!("Connecting to mumd at {}", server_name); let tx0 = IpcSender::connect(server_name).unwrap(); let connect_command = Command::ServerConnect { - host: "10.0.0.10".to_string(), + host: "icahasse.se".to_string(), port: 64738u16, username: "gustav-mumd".to_string(), accept_invalid_cert: true, -- cgit v1.2.1 From e5b8a79f7ba4bc3fddff77863d2332cfc53c1754 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 16 Oct 2020 02:32:03 +0200 Subject: add pretty error messages --- mumctl/src/main.rs | 59 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 14 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index d6c046d..01c5743 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -4,6 +4,15 @@ use log::*; use mumlib::command::{Command, CommandResponse}; use mumlib::setup_logger; use std::{fs, io}; +use colored::Colorize; + +macro_rules! err_print { + ($func:expr) => { + if let Err(e) = $func { + println!("{} {}", "error:".red(), e); + } + }; +} fn main() { setup_logger(); @@ -41,36 +50,58 @@ fn main() { .long("fish"))); let matches = app.clone().get_matches(); - - debug!("Matching clap"); + if let Some(matches) = matches.subcommand_matches("server") { if let Some(matches) = matches.subcommand_matches("connect") { let host = matches.value_of("host").unwrap(); let username = matches.value_of("username").unwrap(); - send_command(Command::ServerConnect { + err_print!(send_command(Command::ServerConnect { host: host.to_string(), port: 64738u16, //TODO username: username.to_string(), accept_invalid_cert: true, //TODO - }).unwrap(); + })); + /*if let Err(e) = send_command(Command::ServerConnect { + host: host.to_string(), + port: 64738u16, //TODO + username: username.to_string(), + accept_invalid_cert: true, //TODO + }) { + println!("{} {}", "error:".red(), e); + }*/ } else if let Some(_) = matches.subcommand_matches("disconnect") { - send_command(Command::ServerDisconnect).unwrap(); + err_print!(send_command(Command::ServerDisconnect)); } } else if let Some(matches) = matches.subcommand_matches("channel") { if let Some(_matches) = matches.subcommand_matches("list") { - let res = send_command(Command::ChannelList).unwrap().unwrap(); - println!("{:#?}", res); - /*if matches.is_present("short") { - None //TODO - } else { - None //TODO - };*/ + match send_command(Command::ChannelList) { + Ok(res) => { + println!("{:#?}", res.unwrap()); + /*if matches.is_present("short") { + None //TODO + } else { + None //TODO + };*/ + } + Err(e) => println!("{} {}", "error:".red(), e), + } } else if let Some(matches) = matches.subcommand_matches("connect") { - send_command(Command::ChannelJoin { + err_print!(send_command(Command::ChannelJoin { channel_id: matches.value_of("channel").unwrap().parse::().unwrap() - }).unwrap(); + })); } } else if let Some(_matches) = matches.subcommand_matches("status") { + match send_command(Command::Status) { + Ok(res) => { + println!("{:#?}", res.unwrap()); + /*if matches.is_present("short") { + None //TODO + } else { + None //TODO + };*/ + } + Err(e) => println!("{} {}", "error:".red(), e), + } let res = send_command(Command::Status).unwrap().unwrap(); println!("{:#?}", res); } else if let Some(matches) = matches.subcommand_matches("completions") { -- cgit v1.2.1 From d15a4adb457b8caab4e76baff8e27ade347a275d Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 16 Oct 2020 02:35:31 +0200 Subject: remove commented out code --- mumctl/src/main.rs | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 01c5743..ae4acc5 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -61,14 +61,6 @@ fn main() { username: username.to_string(), accept_invalid_cert: true, //TODO })); - /*if let Err(e) = send_command(Command::ServerConnect { - host: host.to_string(), - port: 64738u16, //TODO - username: username.to_string(), - accept_invalid_cert: true, //TODO - }) { - println!("{} {}", "error:".red(), e); - }*/ } else if let Some(_) = matches.subcommand_matches("disconnect") { err_print!(send_command(Command::ServerDisconnect)); } @@ -77,11 +69,6 @@ fn main() { match send_command(Command::ChannelList) { Ok(res) => { println!("{:#?}", res.unwrap()); - /*if matches.is_present("short") { - None //TODO - } else { - None //TODO - };*/ } Err(e) => println!("{} {}", "error:".red(), e), } @@ -94,11 +81,6 @@ fn main() { match send_command(Command::Status) { Ok(res) => { println!("{:#?}", res.unwrap()); - /*if matches.is_present("short") { - None //TODO - } else { - None //TODO - };*/ } Err(e) => println!("{} {}", "error:".red(), e), } -- cgit v1.2.1