change connecting with channel name instead of id

5 files changed, 31 insertions, 14 deletions

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") {
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 82d671e..d3f9a8e 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -53,18 +53,25 @@ impl State {
         command: Command,
     ) -> (bool, mumlib::error::Result<Option<CommandResponse>>) {
         match command {
-            Command::ChannelJoin { channel_id } => {
+            Command::ChannelJoin { channel_identifier } => {
                 if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) {
                     return (false, Err(Error::DisconnectedError));
                 }
-                if let Some(server) = &self.server {
-                    if !server.channels().contains_key(&channel_id) {
-                        return (false, Err(Error::InvalidChannelIdError(channel_id)));
-                    }
-                }
+
+                let channels = self.server()
+                    .unwrap()
+                    .channels();
+                let mut idents = channels.iter()
+                    .map(|e| (e.0, e.1.path(channels)));
+
+                let id = match idents.find(|e| e.1.ends_with(&channel_identifier)) {
+                    Some(v) => *v.0,
+                    None => return (false, Err(Error::InvalidChannelIdentifierError(channel_identifier))),
+                };
+
                 let mut msg = msgs::UserState::new();
                 msg.set_session(self.session_id.unwrap());
-                msg.set_channel_id(channel_id);
+                msg.set_channel_id(id);
                 self.packet_sender.send(msg.into()).unwrap();
                 (false, Ok(None))
             }
@@ -73,7 +80,7 @@ impl State {
                     return (false, Err(Error::DisconnectedError));
                 }
                 (false, Ok(Some(CommandResponse::ChannelList {
-                        channels: self.server.as_ref().unwrap().channels().clone(),
+                        channels: self.server().unwrap().channels().clone(),
                     })),
                 )
             }
@@ -188,6 +195,9 @@ impl State {
     pub fn phase_receiver(&self) -> watch::Receiver<StatePhase> {
         self.phase_watcher.1.clone()
     }
+    pub fn server(&self) -> Option<&Server> {
+        self.server.as_ref()
+    }
     pub fn server_mut(&mut self) -> Option<&mut Server> {
         self.server.as_mut()
     }
diff --git a/mumlib/src/command.rs b/mumlib/src/command.rs
index b2ac321..a0673f4 100644
--- a/mumlib/src/command.rs
+++ b/mumlib/src/command.rs
@@ -6,7 +6,7 @@ use std::collections::HashMap;
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum Command {
     ChannelJoin {
-        channel_id: u32,
+        channel_identifier: String,
     },
     ChannelList,
     ServerConnect {
diff --git a/mumlib/src/error.rs b/mumlib/src/error.rs
index cb88aa7..3e514fd 100644
--- a/mumlib/src/error.rs
+++ b/mumlib/src/error.rs
@@ -8,7 +8,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub enum Error {
     DisconnectedError,
     AlreadyConnectedError,
-    InvalidChannelIdError(u32),
+    InvalidChannelIdentifierError(String),
     InvalidServerAddrError(String, u16),
 }
 
@@ -17,7 +17,7 @@ impl Display for Error {
         match self {
             Error::DisconnectedError => write!(f, "Not connected to a server"),
             Error::AlreadyConnectedError => write!(f, "Already connected to a server"),
-            Error::InvalidChannelIdError(id) => write!(f, "Invalid channel id: {}", id),
+            Error::InvalidChannelIdentifierError(id) => write!(f, "Couldn't find channel {}", id),
             Error::InvalidServerAddrError(addr, port) => write!(f, "Invalid server address: {}:{}", addr, port),
         }
     }
diff --git a/mumlib/src/state.rs b/mumlib/src/state.rs
index f90634e..51fb492 100644
--- a/mumlib/src/state.rs
+++ b/mumlib/src/state.rs
@@ -128,6 +128,13 @@ impl Channel {
     pub fn name(&self) -> &str {
         &self.name
     }
+
+    pub fn path(&self, channels: &HashMap<u32, Channel>) -> String {
+        match &self.parent {
+            Some(t) => format!("{}/{}", channels.get(t).unwrap().path(channels), self.name),
+            None => self.name.clone(),
+        }
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]