From 1974db9d719640f5cd5a8b51fa1b97f801f5a809 Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Sat, 17 Oct 2020 01:19:45 +0200
Subject: change connecting with channel name instead of id

---
 mumctl/src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mumctl/src')

diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index ae4acc5..c96db36 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -1,5 +1,5 @@
 use clap::{App, AppSettings, Arg, Shell, SubCommand};
-use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
+use ipc_channel::ipc::{self, IpcSender};
 use log::*;
 use mumlib::command::{Command, CommandResponse};
 use mumlib::setup_logger;
@@ -16,7 +16,6 @@ macro_rules! err_print {
 
 fn main() {
     setup_logger();
-    debug!("Logger up!");
 
     let mut app = App::new("mumctl")
         .setting(AppSettings::ArgRequiredElseHelp)
@@ -73,8 +72,9 @@ fn main() {
                 Err(e) => println!("{} {}", "error:".red(), e),
             }
         } else if let Some(matches) = matches.subcommand_matches("connect") {
+            let channel_arg = matches.value_of("channel").unwrap();
             err_print!(send_command(Command::ChannelJoin {
-                channel_id: matches.value_of("channel").unwrap().parse::<u32>().unwrap()
+                channel_identifier: channel_arg.to_string()
             }));
         }
     } else if let Some(_matches) = matches.subcommand_matches("status") {
-- 
cgit v1.2.1


From 9a9db2473928de240a38349b9726af9ae557374d Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Sat, 17 Oct 2020 01:25:02 +0200
Subject: clean up imports

---
 mumctl/src/main.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mumctl/src')

diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index c96db36..0020c55 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -1,6 +1,5 @@
 use clap::{App, AppSettings, Arg, Shell, SubCommand};
 use ipc_channel::ipc::{self, IpcSender};
-use log::*;
 use mumlib::command::{Command, CommandResponse};
 use mumlib::setup_logger;
 use std::{fs, io};
-- 
cgit v1.2.1


From 74a64c249e0371890f4bb03ee8cd17b5059ddc4c Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Sat, 17 Oct 2020 18:45:51 +0200
Subject: minor changes

---
 mumctl/src/main.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'mumctl/src')

diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index 0020c55..2db9ded 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -71,9 +71,8 @@ fn main() {
                 Err(e) => println!("{} {}", "error:".red(), e),
             }
         } else if let Some(matches) = matches.subcommand_matches("connect") {
-            let channel_arg = matches.value_of("channel").unwrap();
             err_print!(send_command(Command::ChannelJoin {
-                channel_identifier: channel_arg.to_string()
+                channel_identifier: matches.value_of("channel").unwrap().to_string()
             }));
         }
     } else if let Some(_matches) = matches.subcommand_matches("status") {
-- 
cgit v1.2.1