Merge remote-tracking branch 'origin/channel-name' into main

3 files changed, 27 insertions, 4 deletions

diff --git a/mumlib/src/command.rs b/mumlib/src/command.rs
index 9211656..b27d3ca 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,
     InputVolumeSet(f32),
diff --git a/mumlib/src/error.rs b/mumlib/src/error.rs
index cb88aa7..6c66c1f 100644
--- a/mumlib/src/error.rs
+++ b/mumlib/src/error.rs
@@ -8,17 +8,33 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub enum Error {
     DisconnectedError,
     AlreadyConnectedError,
-    InvalidChannelIdError(u32),
+    ChannelIdentifierError(String, ChannelIdentifierError),
     InvalidServerAddrError(String, u16),
 }
 
+
 impl Display for Error {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         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::InvalidServerAddrError(addr, port) => write!(f, "Invalid server address: {}:{}", addr, port),
+            Error::ChannelIdentifierError(id, kind) => write!(f, "{}: {}", kind, id),
+            Error::InvalidServerAddrError(addr, port) => write!(f, "Invalid server address: {}: {}", addr, port),
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum ChannelIdentifierError {
+    Invalid,
+    Ambiguous,
+}
+
+impl Display for ChannelIdentifierError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ChannelIdentifierError::Invalid => write!(f, "Invalid channel identifier"),
+            ChannelIdentifierError::Ambiguous => write!(f, "Ambiguous channel identifier"),
         }
     }
 }
\ No newline at end of file
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)]